diff --git a/tests/long_driver.py b/tests/long_driver.py index fe2d341..4abbffa 100644 --- a/tests/long_driver.py +++ b/tests/long_driver.py @@ -26,7 +26,7 @@ class TestDriverBuild(TestInventoryBase): self.add_new('Frobnitz-Borked-XML-4-HOWTO', example.ex_docbook4xml, content=borked) inv = tldp.inventory.Inventory(c.pubdir, c.sourcedir) - self.assertEquals(2, len(inv.all.keys())) + self.assertEqual(2, len(inv.all.keys())) docs = inv.all.values() result = tldp.driver.build(c, docs) self.assertTrue('Build failed' in result) @@ -40,8 +40,8 @@ class TestDriverBuild(TestInventoryBase): argv.extend(['--build', 'Published-HOWTO']) tldp.driver.run(argv) inv = tldp.inventory.Inventory(c.pubdir, c.sourcedir) - self.assertEquals(1, len(inv.published.keys())) - self.assertEquals(1, len(inv.work.keys())) + self.assertEqual(1, len(inv.published.keys())) + self.assertEqual(1, len(inv.work.keys())) class TestDriverPublish(TestInventoryBase): @@ -51,10 +51,10 @@ class TestDriverPublish(TestInventoryBase): c.publish = True self.add_new('Frobnitz-DocBook-XML-5-HOWTO', example.ex_docbook5xml) inv = tldp.inventory.Inventory(c.pubdir, c.sourcedir) - self.assertEquals(1, len(inv.all.keys())) + self.assertEqual(1, len(inv.all.keys())) docs = inv.all.values() exitcode = tldp.driver.publish(c, docs) - self.assertEquals(exitcode, 0) + self.assertEqual(exitcode, 0) doc = docs.pop(0) self.assertTrue(doc.output.iscomplete) @@ -64,10 +64,10 @@ class TestDriverPublish(TestInventoryBase): c.publish = True self.add_new('Frobnitz-DocBook-XML-4-HOWTO', example.ex_docbook4xml) inv = tldp.inventory.Inventory(c.pubdir, c.sourcedir) - self.assertEquals(1, len(inv.all.keys())) + self.assertEqual(1, len(inv.all.keys())) docs = inv.all.values() exitcode = tldp.driver.publish(c, docs) - self.assertEquals(exitcode, 0) + self.assertEqual(exitcode, 0) doc = docs.pop(0) self.assertTrue(doc.output.iscomplete) @@ -77,11 +77,11 @@ class TestDriverPublish(TestInventoryBase): c.publish = True self.add_new('Frobnitz-Asciidoc-HOWTO', example.ex_asciidoc) inv = tldp.inventory.Inventory(c.pubdir, c.sourcedir) - self.assertEquals(1, len(inv.all.keys())) + self.assertEqual(1, len(inv.all.keys())) docs = inv.all.values() c.skip = [] exitcode = tldp.driver.publish(c, docs) - self.assertEquals(exitcode, 0) + self.assertEqual(exitcode, 0) doc = docs.pop(0) self.assertTrue(doc.output.iscomplete) @@ -90,11 +90,11 @@ class TestDriverPublish(TestInventoryBase): c.publish = True self.add_new('Frobnitz-Linuxdoc-HOWTO', example.ex_linuxdoc) inv = tldp.inventory.Inventory(c.pubdir, c.sourcedir) - self.assertEquals(1, len(inv.all.keys())) + self.assertEqual(1, len(inv.all.keys())) docs = inv.all.values() c.skip = [] exitcode = tldp.driver.publish(c, docs) - self.assertEquals(exitcode, 0) + self.assertEqual(exitcode, 0) doc = docs.pop(0) self.assertTrue(doc.output.iscomplete) @@ -104,10 +104,10 @@ class TestDriverPublish(TestInventoryBase): c.publish = True self.add_new('Frobnitz-DocBookSGML-HOWTO', example.ex_docbooksgml) inv = tldp.inventory.Inventory(c.pubdir, c.sourcedir) - self.assertEquals(1, len(inv.all.keys())) + self.assertEqual(1, len(inv.all.keys())) docs = inv.all.values() exitcode = tldp.driver.publish(c, docs) - self.assertEquals(exitcode, 0) + self.assertEqual(exitcode, 0) doc = docs.pop(0) self.assertTrue(doc.output.iscomplete) @@ -117,7 +117,7 @@ class TestDriverPublish(TestInventoryBase): c.publish = True doc = SourceDocument(example.ex_docbooksgml_dir.filename) exitcode = tldp.driver.publish(c, [doc]) - self.assertEquals(exitcode, 0) + self.assertEqual(exitcode, 0) self.assertTrue(doc.output.iscomplete) outputimages = os.path.join(doc.output.dirname, 'images') self.assertTrue(os.path.exists(outputimages)) diff --git a/tests/test_config.py b/tests/test_config.py index 0bbeb19..a6cc3da 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -17,7 +17,7 @@ class TestConfigWorks(unittest.TestCase): def test_singleoptarg(self): config, args = collectconfiguration('tag', ['--pubdir', '.']) - self.assertEquals(config.pubdir, '.') + self.assertEqual(config.pubdir, '.') # # -- end of file diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 5268ac3..90b0ff3 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -43,55 +43,55 @@ class TestInventoryUsage(TestInventoryBase): ex = random.choice(example.sources) self.add_published('Frobnitz-HOWTO', ex) i = Inventory(c.pubdir, c.sourcedir) - self.assertEquals(0, len(i.stale)) - self.assertEquals(1, len(i.published)) - self.assertEquals(0, len(i.new)) - self.assertEquals(0, len(i.orphan)) - self.assertEquals(0, len(i.broken)) + self.assertEqual(0, len(i.stale)) + self.assertEqual(1, len(i.published)) + self.assertEqual(0, len(i.new)) + self.assertEqual(0, len(i.orphan)) + self.assertEqual(0, len(i.broken)) def test_detect_status_new(self): c = self.config ex = random.choice(example.sources) self.add_new('Frobnitz-HOWTO', ex) i = Inventory(c.pubdir, c.sourcedir) - self.assertEquals(0, len(i.stale)) - self.assertEquals(0, len(i.published)) - self.assertEquals(1, len(i.new)) - self.assertEquals(0, len(i.orphan)) - self.assertEquals(0, len(i.broken)) + self.assertEqual(0, len(i.stale)) + self.assertEqual(0, len(i.published)) + self.assertEqual(1, len(i.new)) + self.assertEqual(0, len(i.orphan)) + self.assertEqual(0, len(i.broken)) def test_detect_status_orphan(self): c = self.config ex = random.choice(example.sources) self.add_orphan('Frobnitz-HOWTO', ex) i = Inventory(c.pubdir, c.sourcedir) - self.assertEquals(0, len(i.stale)) - self.assertEquals(0, len(i.published)) - self.assertEquals(0, len(i.new)) - self.assertEquals(1, len(i.orphan)) - self.assertEquals(0, len(i.broken)) + self.assertEqual(0, len(i.stale)) + self.assertEqual(0, len(i.published)) + self.assertEqual(0, len(i.new)) + self.assertEqual(1, len(i.orphan)) + self.assertEqual(0, len(i.broken)) def test_detect_status_stale(self): c = self.config ex = random.choice(example.sources) self.add_stale('Frobnitz-HOWTO', ex) i = Inventory(c.pubdir, c.sourcedir) - self.assertEquals(1, len(i.stale)) - self.assertEquals(1, len(i.published)) - self.assertEquals(0, len(i.new)) - self.assertEquals(0, len(i.orphan)) - self.assertEquals(0, len(i.broken)) + self.assertEqual(1, len(i.stale)) + self.assertEqual(1, len(i.published)) + self.assertEqual(0, len(i.new)) + self.assertEqual(0, len(i.orphan)) + self.assertEqual(0, len(i.broken)) def test_detect_status_broken(self): c = self.config ex = random.choice(example.sources) self.add_broken('Frobnitz-HOWTO', ex) i = Inventory(c.pubdir, c.sourcedir) - self.assertEquals(0, len(i.stale)) - self.assertEquals(1, len(i.published)) - self.assertEquals(0, len(i.new)) - self.assertEquals(0, len(i.orphan)) - self.assertEquals(1, len(i.broken)) + self.assertEqual(0, len(i.stale)) + self.assertEqual(1, len(i.published)) + self.assertEqual(0, len(i.new)) + self.assertEqual(0, len(i.orphan)) + self.assertEqual(1, len(i.broken)) # # -- end of file diff --git a/tests/test_outputs.py b/tests/test_outputs.py index e0361a0..37a6518 100644 --- a/tests/test_outputs.py +++ b/tests/test_outputs.py @@ -33,13 +33,13 @@ class TestOutputCollection(TestToolsFilesystem): with self.assertRaises(IOError) as ecm: OutputCollection(missing) e = ecm.exception - self.assertEquals(errno.ENOENT, e.errno) + self.assertEqual(errno.ENOENT, e.errno) def test_file_in_output_collection(self): reldir, absdir = self.adddir('collection') self.addfile('collection', __file__, stem='non-directory') oc = OutputCollection(absdir) - self.assertEquals(0, len(oc)) + self.assertEqual(0, len(oc)) def test_manyfiles(self): reldir, absdir = self.adddir('manyfiles') @@ -47,7 +47,7 @@ class TestOutputCollection(TestToolsFilesystem): for x in range(count): self.adddir('manyfiles/Document-Stem-' + str(x)) oc = OutputCollection(absdir) - self.assertEquals(count, len(oc)) + self.assertEqual(count, len(oc)) class TestOutputDirectory(TestToolsFilesystem): @@ -57,7 +57,7 @@ class TestOutputDirectory(TestToolsFilesystem): with self.assertRaises(IOError) as ecm: OutputDirectory(odoc) e = ecm.exception - self.assertEquals(errno.ENOENT, e.errno) + self.assertEqual(errno.ENOENT, e.errno) def test_iscomplete(self): reldir, absdir = self.adddir('outputs/Frobnitz-HOWTO') diff --git a/tests/test_typeguesser.py b/tests/test_typeguesser.py index ebed309..ef3dd46 100644 --- a/tests/test_typeguesser.py +++ b/tests/test_typeguesser.py @@ -55,7 +55,7 @@ class TestDoctypes(unittest.TestCase): def testGuessSingleMatchAsciidoc(self): ex = example.ex_asciidoc dt = genericGuessTest(ex.content, '.txt') - self.assertEquals(ex.doctype, dt) + self.assertEqual(ex.doctype, dt) def testGuessTooManyMatches(self): a = example.ex_docbook4xml.content diff --git a/tests/test_utils.py b/tests/test_utils.py index 4d9c0e2..5aa13db 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -48,7 +48,7 @@ class Test_isreadablefile_and_friends(unittest.TestCase): def test_arg_isreadablefile(self): f = ntf(prefix='readable-file') - self.assertEquals(f.name, arg_isreadablefile(f.name)) + self.assertEqual(f.name, arg_isreadablefile(f.name)) os.chmod(f.name, 0) self.assertIsNone(arg_isreadablefile(f.name)) @@ -56,10 +56,10 @@ class Test_isreadablefile_and_friends(unittest.TestCase): class Test_arg_isloglevel(unittest.TestCase): def test_arg_isloglevel_integer(self): - self.assertEquals(7, arg_isloglevel(7)) - self.assertEquals(40, arg_isloglevel('frobnitz')) - self.assertEquals(20, arg_isloglevel('INFO')) - self.assertEquals(10, arg_isloglevel('DEBUG')) + self.assertEqual(7, arg_isloglevel(7)) + self.assertEqual(40, arg_isloglevel('frobnitz')) + self.assertEqual(20, arg_isloglevel('INFO')) + self.assertEqual(10, arg_isloglevel('DEBUG')) class Test_arg_isdirectory(TestToolsFilesystem): @@ -174,7 +174,7 @@ class Test_statfiles(unittest.TestCase): this = os.path.join(here, str(uuid.uuid4())) statinfo = statfiles(this) self.assertIsInstance(statinfo, dict) - self.assertEquals(0, len(statinfo)) + self.assertEqual(0, len(statinfo)) class Test_statfile(TestToolsFilesystem):