aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2014-03-27 16:38:29 +0000
committerBryn M. Reeves <bmr@redhat.com>2014-03-27 16:38:29 +0000
commitf5be64704096d5bdf9f75cc78dc571c6d9325fcb (patch)
treeb35bd972d6dfe1708ed54abf5e74880bb0673bb3
parenta09090ab98b10e2eca363a4919397545d64f1c85 (diff)
downloadsos-f5be64704096d5bdf9f75cc78dc571c6d9325fcb.tar.gz
Remove references to 'sub' parameter from plugin tests
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--tests/plugin_tests.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/plugin_tests.py b/tests/plugin_tests.py
index 4ba59686..cf874f17 100644
--- a/tests/plugin_tests.py
+++ b/tests/plugin_tests.py
@@ -197,10 +197,6 @@ class PluginTests(unittest.TestCase):
self.mp.do_copy_path("tests")
self.assertEquals(self.mp.archive.m["tests/plugin_tests.py"], 'tests/plugin_tests.py')
- def test_copy_dir_sub(self):
- self.mp.do_copy_path("tests", sub=("tests/", "foobar/"))
- self.assertEquals(self.mp.archive.m["tests/plugin_tests.py"], 'foobar/plugin_tests.py')
-
def test_copy_dir_bad_path(self):
self.mp.do_copy_path("not_here_tests")
self.assertEquals(self.mp.archive.m, {})
@@ -225,14 +221,14 @@ class AddCopySpecLimitTests(unittest.TestCase):
def test_single_file_under_limit(self):
self.mp.add_copy_spec_limit("tests/tail_test.txt", 1)
- self.assertEquals(self.mp.copy_specs, [('tests/tail_test.txt', None)])
+ self.assertEquals(self.mp.copy_specs, ['tests/tail_test.txt'])
def test_single_file_over_limit(self):
fn = create_file(2) # create 2MB file, consider a context manager
- self.mp.add_copy_spec_limit(fn, 1, sub=('tmp', 'awesome'))
+ self.mp.add_copy_spec_limit(fn, 1)
content, fname = self.mp.copy_strings[0]
self.assertTrue("tailed" in fname)
- self.assertTrue("awesome" in fname)
+ self.assertTrue("tmp" in fname)
self.assertTrue("/" not in fname)
self.assertEquals(1024 * 1024, len(content))
os.unlink(fn)