<86>May 7 08:29:06 userdel[2805713]: delete user 'rooter' <86>May 7 08:29:06 userdel[2805713]: removed group 'rooter' owned by 'rooter' <86>May 7 08:29:06 userdel[2805713]: removed shadow group 'rooter' owned by 'rooter' <86>May 7 08:29:06 groupadd[2805732]: group added to /etc/group: name=rooter, GID=795 <86>May 7 08:29:06 groupadd[2805732]: group added to /etc/gshadow: name=rooter <86>May 7 08:29:06 groupadd[2805732]: new group: name=rooter, GID=795 <86>May 7 08:29:06 useradd[2805745]: new user: name=rooter, UID=795, GID=795, home=/root, shell=/bin/bash <86>May 7 08:29:06 userdel[2805763]: delete user 'builder' <86>May 7 08:29:06 userdel[2805763]: removed group 'builder' owned by 'builder' <86>May 7 08:29:06 userdel[2805763]: removed shadow group 'builder' owned by 'builder' <86>May 7 08:29:06 groupadd[2805780]: group added to /etc/group: name=builder, GID=796 <86>May 7 08:29:06 groupadd[2805780]: group added to /etc/gshadow: name=builder <86>May 7 08:29:06 groupadd[2805780]: new group: name=builder, GID=796 <86>May 7 08:29:06 useradd[2805793]: new user: name=builder, UID=796, GID=796, home=/usr/src, shell=/bin/bash <13>May 7 08:29:08 rpmi: libgdbm-1.8.3-alt10 1454943313 installed <13>May 7 08:29:08 rpmi: libexpat-2.4.3-alt1 p9+293696.100.1.1 1643124786 installed <13>May 7 08:29:08 rpmi: libp11-kit-0.23.15-alt2 p9+254920.2400.19.1 1601385869 installed <13>May 7 08:29:08 rpmi: libtasn1-4.14-alt1 p9+235792.100.2.1 1565425233 installed <13>May 7 08:29:08 rpmi: rpm-macros-alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed <13>May 7 08:29:08 rpmi: alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed <13>May 7 08:29:08 rpmi: ca-certificates-2021.10.06-alt1 p9+289862.100.1.1 1637033643 installed <13>May 7 08:29:08 rpmi: ca-trust-0.1.2-alt1 p9+233349.100.1.1 1561655062 installed <13>May 7 08:29:08 rpmi: p11-kit-trust-0.23.15-alt2 p9+254920.2400.19.1 1601385869 installed <13>May 7 08:29:08 rpmi: libcrypto1.1-1.1.1t-alt1 p9+314826.100.5.1 1676897865 installed <13>May 7 08:29:08 rpmi: libssl1.1-1.1.1t-alt1 p9+314826.100.5.1 1676897865 installed <13>May 7 08:29:08 rpmi: python3-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed <13>May 7 08:29:08 rpmi: libpython3-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed <13>May 7 08:29:09 rpmi: python3-base-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed <13>May 7 08:29:09 rpmi: tests-for-installed-python3-pkgs-0.1.13.1-alt2 1535450458 installed <13>May 7 08:29:09 rpmi: rpm-build-python3-0.1.13.1-alt2 1535450458 installed <13>May 7 08:29:11 rpmi: python-modules-curses-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:11 rpmi: libtinfo-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686221 installed <13>May 7 08:29:12 rpmi: libncurses-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686221 installed <13>May 7 08:29:12 rpmi: libverto-0.3.0-alt1_7 sisyphus+225932.100.1.1 1553994917 installed <13>May 7 08:29:12 rpmi: libkeyutils-1.6-alt2 sisyphus+226520.100.2.1 1554512088 installed <13>May 7 08:29:12 rpmi: libcom_err-1.44.6-alt1 sisyphus+224154.100.1.1 1552091653 installed <86>May 7 08:29:12 groupadd[2818371]: group added to /etc/group: name=_keytab, GID=499 <86>May 7 08:29:12 groupadd[2818371]: group added to /etc/gshadow: name=_keytab <86>May 7 08:29:12 groupadd[2818371]: new group: name=_keytab, GID=499 <13>May 7 08:29:12 rpmi: libkrb5-1.17.2-alt4 p9+310094.100.3.1 1669309764 installed <13>May 7 08:29:12 rpmi: libtirpc-1.0.3-alt1 1532008015 installed <13>May 7 08:29:12 rpmi: libnsl2-1.1.0-alt1_1 1511548748 installed <13>May 7 08:29:12 rpmi: python-modules-compiler-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-email-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-unittest-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-encodings-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-nis-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-xml-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-hotshot-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-bsddb-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-ctypes-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-multiprocessing-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-logging-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-modules-distutils-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: libnsl2-devel-1.1.0-alt1_1 1511548748 installed <13>May 7 08:29:12 rpmi: python-dev-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python-tools-2to3-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed <13>May 7 08:29:12 rpmi: python3-dev-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed Building target platforms: x86_64 Building for target x86_64 Wrote: /usr/src/in/nosrpm/python-module-mox-0.5.3-alt3.git20140721.2.nosrc.rpm (w1.gzdio) <13>May 7 08:29:14 rpmi: python3-module-pkg_resources-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed <13>May 7 08:29:14 rpmi: python-module-pkg_resources-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed <13>May 7 08:29:14 rpmi: python-module-setuptools-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed <13>May 7 08:29:14 rpmi: python3-module-setuptools-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed Installing python-module-mox-0.5.3-alt3.git20140721.2.src.rpm Building target platforms: x86_64 Building for target x86_64 Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.17142 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + rm -rf mox-0.5.3 + echo 'Source #0 (mox-0.5.3.tar):' Source #0 (mox-0.5.3.tar): + /bin/tar -xf /usr/src/RPM/SOURCES/mox-0.5.3.tar + cd mox-0.5.3 + /bin/chmod -c -Rf u+rwX,go-w . + cp -fR . ../python3 + find ../python3 -type f -name '*.py' -exec 2to3 -w -n '{}' + RefactoringTool: Skipping optional fixer: buffer RefactoringTool: Skipping optional fixer: idioms RefactoringTool: Skipping optional fixer: set_literal RefactoringTool: Skipping optional fixer: ws_comma RefactoringTool: No changes to ../python3/stubout_testee.py RefactoringTool: No changes to ../python3/stubout_test.py RefactoringTool: Refactored ../python3/stubout.py RefactoringTool: No changes to ../python3/setup.py RefactoringTool: No changes to ../python3/mox_test_helper.py RefactoringTool: Refactored ../python3/mox_test.py --- ../python3/stubout.py (original) +++ ../python3/stubout.py (refactored) @@ -59,7 +59,7 @@ Raises AttributeError if the attribute cannot be found. """ if (inspect.ismodule(obj) or - (not inspect.isclass(obj) and obj.__dict__.has_key(attr_name))): + (not inspect.isclass(obj) and attr_name in obj.__dict__)): orig_obj = obj orig_attr = getattr(obj, attr_name) @@ -122,7 +122,7 @@ if isinstance(old_attribute, staticmethod): old_child = staticmethod(old_child) elif isinstance(old_attribute, classmethod): - old_child = classmethod(old_child.im_func) + old_child = classmethod(old_child.__func__) self.cache.append((parent, old_child, child_name)) setattr(parent, child_name, new_child) --- ../python3/mox_test.py (original) +++ ../python3/mox_test.py (refactored) @@ -66,13 +66,13 @@ def testValidOr(self): """Or should be True if either Comparator returns True.""" - self.assert_(mox.Or(mox.IsA(dict), mox.IsA(str)) == {}) - self.assert_(mox.Or(mox.IsA(dict), mox.IsA(str)) == 'test') - self.assert_(mox.Or(mox.IsA(str), mox.IsA(str)) == 'test') + self.assertTrue(mox.Or(mox.IsA(dict), mox.IsA(str)) == {}) + self.assertTrue(mox.Or(mox.IsA(dict), mox.IsA(str)) == 'test') + self.assertTrue(mox.Or(mox.IsA(str), mox.IsA(str)) == 'test') def testInvalidOr(self): """Or should be False if both Comparators return False.""" - self.failIf(mox.Or(mox.IsA(dict), mox.IsA(str)) == 0) + self.assertFalse(mox.Or(mox.IsA(dict), mox.IsA(str)) == 0) class AndTest(unittest.TestCase): @@ -80,12 +80,12 @@ def testValidAnd(self): """And should be True if both Comparators return True.""" - self.assert_(mox.And(mox.IsA(str), mox.IsA(str)) == '1') + self.assertTrue(mox.And(mox.IsA(str), mox.IsA(str)) == '1') def testClauseOneFails(self): """And should be False if the first Comparator returns False.""" - self.failIf(mox.And(mox.IsA(dict), mox.IsA(str)) == '1') + self.assertFalse(mox.And(mox.IsA(dict), mox.IsA(str)) == '1') def testAdvancedUsage(self): """And should work with other Comparators. @@ -93,13 +93,13 @@ Note: this test is reliant on In and ContainsKeyValue. """ test_dict = {"mock" : "obj", "testing" : "isCOOL"} - self.assert_(mox.And(mox.In("testing"), + self.assertTrue(mox.And(mox.In("testing"), mox.ContainsKeyValue("mock", "obj")) == test_dict) def testAdvancedUsageFails(self): """Note: this test is reliant on In and ContainsKeyValue.""" test_dict = {"mock" : "obj", "testing" : "isCOOL"} - self.failIf(mox.And(mox.In("NOTFOUND"), + self.assertFalse(mox.And(mox.In("NOTFOUND"), mox.ContainsKeyValue("mock", "obj")) == test_dict) class FuncTest(unittest.TestCase): @@ -110,13 +110,13 @@ equals_one = lambda x: x == 1 always_none = lambda x: None - self.assert_(mox.Func(equals_one) == 1) - self.failIf(mox.Func(equals_one) == 0) - - - self.failIf(mox.Func(always_none) == 1) - self.failIf(mox.Func(always_none) == 0) - self.failIf(mox.Func(always_none) == None) + self.assertTrue(mox.Func(equals_one) == 1) + self.assertFalse(mox.Func(equals_one) == 0) + + + self.assertFalse(mox.Func(always_none) == 1) + self.assertFalse(mox.Func(always_none) == 0) + self.assertFalse(mox.Func(always_none) == None) def testFuncExceptionPropagation(self): """Exceptions within the validating function should propagate.""" @@ -129,7 +129,7 @@ else: return True - self.assert_(mox.Func(raiseExceptionOnNotOne) == 1) + self.assertTrue(mox.Func(raiseExceptionOnNotOne) == 1) self.assertRaises(TestException, mox.Func(raiseExceptionOnNotOne).__eq__, 2) class SameElementsAsTest(unittest.TestCase): @@ -137,32 +137,32 @@ def testSortedLists(self): """Should return True if two lists are exactly equal.""" - self.assert_(mox.SameElementsAs([1, 2.0, 'c']) == [1, 2.0, 'c']) + self.assertTrue(mox.SameElementsAs([1, 2.0, 'c']) == [1, 2.0, 'c']) def testUnsortedLists(self): """Should return True if two lists are unequal but have same elements.""" - self.assert_(mox.SameElementsAs([1, 2.0, 'c']) == [2.0, 'c', 1]) + self.assertTrue(mox.SameElementsAs([1, 2.0, 'c']) == [2.0, 'c', 1]) def testUnhashableLists(self): """Should return True if two lists have the same unhashable elements.""" - self.assert_(mox.SameElementsAs([{'a': 1}, {2: 'b'}]) == + self.assertTrue(mox.SameElementsAs([{'a': 1}, {2: 'b'}]) == [{2: 'b'}, {'a': 1}]) def testEmptyLists(self): """Should return True for two empty lists.""" - self.assert_(mox.SameElementsAs([]) == []) + self.assertTrue(mox.SameElementsAs([]) == []) def testUnequalLists(self): """Should return False if the lists are not equal.""" - self.failIf(mox.SameElementsAs([1, 2.0, 'c']) == [2.0, 'c']) + self.assertFalse(mox.SameElementsAs([1, 2.0, 'c']) == [2.0, 'c']) def testUnequalUnhashableLists(self): """Should return False if two lists with unhashable elements are unequal.""" - self.failIf(mox.SameElementsAs([{'a': 1}, {2: 'b'}]) == [{2: 'b'}]) + self.assertFalse(mox.SameElementsAs([{'a': 1}, {2: 'b'}]) == [{2: 'b'}]) def testActualIsNotASequence(self): """Should return False if the actual object is not a sequence.""" - self.failIf(mox.SameElementsAs([1]) == object()) + self.assertFalse(mox.SameElementsAs([1]) == object()) def testOneUnhashableObjectInActual(self): """Store the entire iterator for a correct comparison. @@ -171,7 +171,7 @@ unhashable object was encountered and then was restarted, so the actual list appeared smaller than it was. """ - self.failIf(mox.SameElementsAs([1, 2]) == iter([{}, 1, 2])) + self.assertFalse(mox.SameElementsAs([1, 2]) == iter([{}, 1, 2])) class ContainsKeyValueTest(unittest.TestCase): @@ -180,15 +180,15 @@ def testValidPair(self): """Should return True if the key value is in the dict.""" - self.assert_(mox.ContainsKeyValue("key", 1) == {"key": 1}) + self.assertTrue(mox.ContainsKeyValue("key", 1) == {"key": 1}) def testInvalidValue(self): """Should return False if the value is not correct.""" - self.failIf(mox.ContainsKeyValue("key", 1) == {"key": 2}) + self.assertFalse(mox.ContainsKeyValue("key", 1) == {"key": 2}) def testInvalidKey(self): """Should return False if they key is not in the dict.""" - self.failIf(mox.ContainsKeyValue("qux", 1) == {"key": 2}) + self.assertFalse(mox.ContainsKeyValue("qux", 1) == {"key": 2}) class ContainsAttributeValueTest(unittest.TestCase): @@ -206,15 +206,15 @@ def testValidPair(self): """Should return True if the object has the key attribute and it matches.""" - self.assert_(mox.ContainsAttributeValue("key", 1) == self.test_object) + self.assertTrue(mox.ContainsAttributeValue("key", 1) == self.test_object) def testInvalidValue(self): """Should return False if the value is not correct.""" - self.failIf(mox.ContainsKeyValue("key", 2) == self.test_object) + self.assertFalse(mox.ContainsKeyValue("key", 2) == self.test_object) def testInvalidKey(self): """Should return False if they the object doesn't have the property.""" - self.failIf(mox.ContainsKeyValue("qux", 1) == self.test_object) + self.assertFalse(mox.ContainsKeyValue("qux", 1) == self.test_object) class InTest(unittest.TestCase): @@ -222,24 +222,24 @@ def testItemInList(self): """Should return True if the item is in the list.""" - self.assert_(mox.In(1) == [1, 2, 3]) + self.assertTrue(mox.In(1) == [1, 2, 3]) def testKeyInDict(self): """Should return True if the item is a key in a dict.""" - self.assert_(mox.In("test") == {"test" : "module"}) + self.assertTrue(mox.In("test") == {"test" : "module"}) def testItemInTuple(self): """Should return True if the item is in the list.""" - self.assert_(mox.In(1) == (1, 2, 3)) + self.assertTrue(mox.In(1) == (1, 2, 3)) def testTupleInTupleOfTuples(self): - self.assert_(mox.In((1, 2, 3)) == ((1, 2, 3), (1, 2))) + self.assertTrue(mox.In((1, 2, 3)) == ((1, 2, 3), (1, 2))) def testItemNotInList(self): - self.failIf(mox.In(1) == [2, 3]) + self.assertFalse(mox.In(1) == [2, 3]) def testTupleNotInTupleOfTuples(self): - self.failIf(mox.In((1, 2)) == ((1, 2, 3), (4, 5))) + self.assertFalse(mox.In((1, 2)) == ((1, 2, 3), (4, 5))) class NotTest(unittest.TestCase): @@ -247,15 +247,15 @@ def testItemInList(self): """Should return True if the item is NOT in the list.""" - self.assert_(mox.Not(mox.In(42)) == [1, 2, 3]) + self.assertTrue(mox.Not(mox.In(42)) == [1, 2, 3]) def testKeyInDict(self): """Should return True if the item is NOT a key in a dict.""" - self.assert_(mox.Not(mox.In("foo")) == {"key" : 42}) + self.assertTrue(mox.Not(mox.In("foo")) == {"key" : 42}) def testInvalidKeyWithNot(self): """Should return False if they key is NOT in the dict.""" - self.assert_(mox.Not(mox.ContainsKeyValue("qux", 1)) == {"key": 2}) + self.assertTrue(mox.Not(mox.ContainsKeyValue("qux", 1)) == {"key": 2}) class StrContainsTest(unittest.TestCase): @@ -264,23 +264,23 @@ def testValidSubstringAtStart(self): """Should return True if the substring is at the start of the string.""" - self.assert_(mox.StrContains("hello") == "hello world") + self.assertTrue(mox.StrContains("hello") == "hello world") def testValidSubstringInMiddle(self): """Should return True if the substring is in the middle of the string.""" - self.assert_(mox.StrContains("lo wo") == "hello world") + self.assertTrue(mox.StrContains("lo wo") == "hello world") def testValidSubstringAtEnd(self): """Should return True if the substring is at the end of the string.""" - self.assert_(mox.StrContains("ld") == "hello world") + self.assertTrue(mox.StrContains("ld") == "hello world") def testInvaildSubstring(self): """Should return False if the substring is not in the string.""" - self.failIf(mox.StrContains("AAA") == "hello world") + self.assertFalse(mox.StrContains("AAA") == "hello world") def testMultipleMatches(self): """Should return True if there are multiple occurances of substring.""" - self.assert_(mox.StrContains("abc") == "ababcabcabcababc") + self.assertTrue(mox.StrContains("abc") == "ababcabcabcababc") class RegexTest(unittest.TestCase): @@ -295,23 +295,23 @@ This ensures that re.search is used (instead of re.find). """ - self.assert_(mox.Regex(r"a\s+b") == "x y z a b c") + self.assertTrue(mox.Regex(r"a\s+b") == "x y z a b c") def testNonMatchPattern(self): """Should return False if the pattern does not match the string.""" - self.failIf(mox.Regex(r"a\s+b") == "x y z") + self.assertFalse(mox.Regex(r"a\s+b") == "x y z") def testFlagsPassedCorrectly(self): """Should return True as we pass IGNORECASE flag.""" - self.assert_(mox.Regex(r"A", re.IGNORECASE) == "a") + self.assertTrue(mox.Regex(r"A", re.IGNORECASE) == "a") def testReprWithoutFlags(self): """repr should return the regular expression pattern.""" - self.assert_(repr(mox.Regex(r"a\s+b")) == "") + self.assertTrue(repr(mox.Regex(r"a\s+b")) == "") def testReprWithFlags(self): """repr should return the regular expression pattern and flags.""" - self.assert_(repr(mox.Regex(r"a\s+b", flags=4)) == + self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) == "") @@ -366,37 +366,37 @@ def testEqualityValid(self): """Verify that == correctly identifies objects of the same type.""" - self.assert_(mox.IsA(str) == 'test') + self.assertTrue(mox.IsA(str) == 'test') def testEqualityInvalid(self): """Verify that == correctly identifies objects of different types.""" - self.failIf(mox.IsA(str) == 10) + self.assertFalse(mox.IsA(str) == 10) def testInequalityValid(self): """Verify that != identifies objects of different type.""" - self.assert_(mox.IsA(str) != 10) + self.assertTrue(mox.IsA(str) != 10) def testInequalityInvalid(self): """Verify that != correctly identifies objects of the same type.""" - self.failIf(mox.IsA(str) != "test") + self.assertFalse(mox.IsA(str) != "test") def testEqualityInListValid(self): """Verify list contents are properly compared.""" isa_list = [mox.IsA(str), mox.IsA(str)] str_list = ["abc", "def"] - self.assert_(isa_list == str_list) + self.assertTrue(isa_list == str_list) def testEquailtyInListInvalid(self): """Verify list contents are properly compared.""" isa_list = [mox.IsA(str),mox.IsA(str)] mixed_list = ["abc", 123] - self.failIf(isa_list == mixed_list) + self.assertFalse(isa_list == mixed_list) def testSpecialTypes(self): """Verify that IsA can handle objects like StringIO.""" isA = mox.IsA(StringIO()) stringIO = StringIO() - self.assert_(isA == stringIO) + self.assertTrue(isA == stringIO) class IsAlmostTest(unittest.TestCase): @@ -404,23 +404,23 @@ def testEqualityValid(self): """Verify that == correctly identifies nearly equivalent floats.""" - self.assertEquals(mox.IsAlmost(1.8999999999), 1.9) + self.assertEqual(mox.IsAlmost(1.8999999999), 1.9) def testEqualityInvalid(self): """Verify that == correctly identifies non-equivalent floats.""" - self.assertNotEquals(mox.IsAlmost(1.899), 1.9) + self.assertNotEqual(mox.IsAlmost(1.899), 1.9) def testEqualityWithPlaces(self): """Verify that specifying places has the desired effect.""" - self.assertNotEquals(mox.IsAlmost(1.899), 1.9) - self.assertEquals(mox.IsAlmost(1.899, places=2), 1.9) + self.assertNotEqual(mox.IsAlmost(1.899), 1.9) + self.assertEqual(mox.IsAlmost(1.899, places=2), 1.9) def testNonNumericTypes(self): """Verify that IsAlmost handles non-numeric types properly.""" - self.assertNotEquals(mox.IsAlmost(1.8999999999), '1.9') - self.assertNotEquals(mox.IsAlmost('1.8999999999'), 1.9) - self.assertNotEquals(mox.IsAlmost('1.8999999999'), '1.9') + self.assertNotEqual(mox.IsAlmost(1.8999999999), '1.9') + self.assertNotEqual(mox.IsAlmost('1.8999999999'), 1.9) + self.assertNotEqual(mox.IsAlmost('1.8999999999'), '1.9') class ValueRememberTest(unittest.TestCase): @@ -430,28 +430,28 @@ """Verify that value will compare to stored value.""" value = mox.Value() value.store_value('hello world') - self.assertEquals(value, 'hello world') + self.assertEqual(value, 'hello world') def testNoValue(self): """Verify that uninitialized value does not compare to "empty" values.""" value = mox.Value() - self.assertNotEquals(value, None) - self.assertNotEquals(value, False) - self.assertNotEquals(value, 0) - self.assertNotEquals(value, '') - self.assertNotEquals(value, ()) - self.assertNotEquals(value, []) - self.assertNotEquals(value, {}) - self.assertNotEquals(value, object()) - self.assertNotEquals(value, set()) + self.assertNotEqual(value, None) + self.assertNotEqual(value, False) + self.assertNotEqual(value, 0) + self.assertNotEqual(value, '') + self.assertNotEqual(value, ()) + self.assertNotEqual(value, []) + self.assertNotEqual(value, {}) + self.assertNotEqual(value, object()) + self.assertNotEqual(value, set()) def testRememberValue(self): """Verify that comparing against remember will store argument.""" value = mox.Value() remember = mox.Remember(value) - self.assertNotEquals(value, 'hello world') # value not yet stored. - self.assertEquals(remember, 'hello world') # store value here. - self.assertEquals(value, 'hello world') # compare against stored value. + self.assertNotEqual(value, 'hello world') # value not yet stored. + self.assertEqual(remember, 'hello world') # store value here. + self.assertEqual(value, 'hello world') # compare against stored value. class MockMethodTest(unittest.TestCase): @@ -465,19 +465,19 @@ def testNameAttribute(self): """Should provide a __name__ attribute.""" - self.assertEquals('testMethod', self.mock_method.__name__) + self.assertEqual('testMethod', self.mock_method.__name__) def testAndReturnNoneByDefault(self): """Should return None by default.""" return_value = self.mock_method(['original']) - self.assert_(return_value == None) + self.assertTrue(return_value == None) def testAndReturnValue(self): """Should return a specificed return value.""" expected_return_value = "test" self.expected_method.AndReturn(expected_return_value) return_value = self.mock_method(['original']) - self.assert_(return_value == expected_return_value) + self.assertTrue(return_value == expected_return_value) def testAndRaiseException(self): """Should raise a specified exception.""" @@ -493,7 +493,7 @@ mutable_list[0] = 'mutation' self.expected_method.WithSideEffects(modifier).AndReturn(1) self.mock_method(local_list) - self.assertEquals('mutation', local_list[0]) + self.assertEqual('mutation', local_list[0]) def testWithReturningSideEffects(self): """Should call state modifier and propagate its return value.""" @@ -505,8 +505,8 @@ return expected_return self.expected_method.WithSideEffects(modifier_with_return) actual_return = self.mock_method(local_list) - self.assertEquals('mutation', local_list[0]) - self.assertEquals(expected_return, actual_return) + self.assertEqual('mutation', local_list[0]) + self.assertEqual(expected_return, actual_return) def testWithReturningSideEffectsWithAndReturn(self): """Should call state modifier and ignore its return value.""" @@ -520,8 +520,8 @@ self.expected_method.WithSideEffects(modifier_with_return).AndReturn( expected_return) actual_return = self.mock_method(local_list) - self.assertEquals('mutation', local_list[0]) - self.assertEquals(expected_return, actual_return) + self.assertEqual('mutation', local_list[0]) + self.assertEqual(expected_return, actual_return) def testEqualityNoParamsEqual(self): """Methods with the same name and without params should be equal.""" @@ -531,7 +531,7 @@ def testEqualityNoParamsNotEqual(self): """Methods with different names and without params should not be equal.""" expected_method = mox.MockMethod("otherMethod", [], [], False) - self.failIfEqual(self.mock_method, expected_method) + self.assertNotEqual(self.mock_method, expected_method) def testEqualityParamsEqual(self): """Methods with the same name and parameters should be equal.""" @@ -548,7 +548,7 @@ expected_method._params = [1, 2, 3] self.mock_method._params = ['a', 'b', 'c'] - self.failIfEqual(self.mock_method, expected_method) + self.assertNotEqual(self.mock_method, expected_method) def testEqualityNamedParamsEqual(self): """Methods with the same name and same named params should be equal.""" @@ -565,11 +565,11 @@ expected_method._named_params = {"input1": "test", "input2": "params"} self.mock_method._named_params = {"input1": "test2", "input2": "params2"} - self.failIfEqual(self.mock_method, expected_method) + self.assertNotEqual(self.mock_method, expected_method) def testEqualityWrongType(self): """Method should not be equal to an object of a different type.""" - self.failIfEqual(self.mock_method, "string?") + self.assertNotEqual(self.mock_method, "string?") def testObjectEquality(self): """Equality of objects should work without a Comparator""" @@ -629,12 +629,12 @@ self.mock_object._Replay() actual = str(self.mock_object) self.mock_object._Verify(); - self.assertEquals("foo", actual) + self.assertEqual("foo", actual) def testSetupMode(self): """Verify the mock will accept any call.""" self.mock_object.NonsenseCall() - self.assert_(len(self.mock_object._expected_calls_queue) == 1) + self.assertTrue(len(self.mock_object._expected_calls_queue) == 1) def testReplayWithExpectedCall(self): """Verify the mock replays method calls as expected.""" @@ -668,7 +668,7 @@ self.mock_object[1].AndReturn(True) self.mock_object._Replay() returned_val = self.mock_object[1] - self.assert_(returned_val) + self.assertTrue(returned_val) self.mock_object._Verify() def testNonzero(self): @@ -689,18 +689,18 @@ def testEquals(self): """A mock should be able to compare itself to another object.""" self.mock_object._Replay() - self.assertEquals(self.mock_object, self.mock_object) + self.assertEqual(self.mock_object, self.mock_object) def testEqualsMockFailure(self): """Verify equals identifies unequal objects.""" self.mock_object.SillyCall() self.mock_object._Replay() - self.assertNotEquals(self.mock_object, mox.MockAnything()) + self.assertNotEqual(self.mock_object, mox.MockAnything()) def testEqualsInstanceFailure(self): """Verify equals identifies that objects are different instances.""" self.mock_object._Replay() - self.assertNotEquals(self.mock_object, TestClass()) + self.assertNotEqual(self.mock_object, TestClass()) def testNotEquals(self): """Verify not equals works.""" @@ -735,13 +735,13 @@ self.mock_object().AndReturn('mox0rd') self.mock_object._Replay() - self.assertEquals('mox0rd', self.mock_object()) + self.assertEqual('mox0rd', self.mock_object()) self.mock_object._Verify() def testIsReprable(self): """Test that MockAnythings can be repr'd without causing a failure.""" - self.failUnless('MockAnything' in repr(self.mock_object)) + self.assertTrue('MockAnything' in repr(self.mock_object)) class MethodCheckerTest(unittest.TestCase): @@ -891,7 +891,7 @@ def testSetupModeWithValidCall(self): """Verify the mock object properly mocks a basic method call.""" self.mock_object.ValidCall() - self.assert_(len(self.mock_object._expected_calls_queue) == 1) + self.assertTrue(len(self.mock_object._expected_calls_queue) == 1) def testSetupModeWithInvalidCall(self): """UnknownMethodCallError should be raised if a non-member method is called. @@ -923,47 +923,47 @@ def testIsInstance(self): """Mock should be able to pass as an instance of the mocked class.""" - self.assert_(isinstance(self.mock_object, TestClass)) + self.assertTrue(isinstance(self.mock_object, TestClass)) def testFindValidMethods(self): """Mock should be able to mock all public methods.""" - self.assert_('ValidCall' in self.mock_object._known_methods) - self.assert_('OtherValidCall' in self.mock_object._known_methods) - self.assert_('MyClassMethod' in self.mock_object._known_methods) - self.assert_('MyStaticMethod' in self.mock_object._known_methods) - self.assert_('_ProtectedCall' in self.mock_object._known_methods) - self.assert_('__PrivateCall' not in self.mock_object._known_methods) - self.assert_('_TestClass__PrivateCall' in self.mock_object._known_methods) + self.assertTrue('ValidCall' in self.mock_object._known_methods) + self.assertTrue('OtherValidCall' in self.mock_object._known_methods) + self.assertTrue('MyClassMethod' in self.mock_object._known_methods) + self.assertTrue('MyStaticMethod' in self.mock_object._known_methods) + self.assertTrue('_ProtectedCall' in self.mock_object._known_methods) + self.assertTrue('__PrivateCall' not in self.mock_object._known_methods) + self.assertTrue('_TestClass__PrivateCall' in self.mock_object._known_methods) def testFindsSuperclassMethods(self): """Mock should be able to mock superclasses methods.""" self.mock_object = mox.MockObject(ChildClass) - self.assert_('ValidCall' in self.mock_object._known_methods) - self.assert_('OtherValidCall' in self.mock_object._known_methods) - self.assert_('MyClassMethod' in self.mock_object._known_methods) - self.assert_('ChildValidCall' in self.mock_object._known_methods) + self.assertTrue('ValidCall' in self.mock_object._known_methods) + self.assertTrue('OtherValidCall' in self.mock_object._known_methods) + self.assertTrue('MyClassMethod' in self.mock_object._known_methods) + self.assertTrue('ChildValidCall' in self.mock_object._known_methods) def testAccessClassVariables(self): """Class variables should be accessible through the mock.""" - self.assert_('SOME_CLASS_VAR' in self.mock_object._known_vars) - self.assert_('_PROTECTED_CLASS_VAR' in self.mock_object._known_vars) - self.assertEquals('test_value', self.mock_object.SOME_CLASS_VAR) + self.assertTrue('SOME_CLASS_VAR' in self.mock_object._known_vars) + self.assertTrue('_PROTECTED_CLASS_VAR' in self.mock_object._known_vars) + self.assertEqual('test_value', self.mock_object.SOME_CLASS_VAR) def testEquals(self): """A mock should be able to compare itself to another object.""" self.mock_object._Replay() - self.assertEquals(self.mock_object, self.mock_object) + self.assertEqual(self.mock_object, self.mock_object) def testEqualsMockFailure(self): """Verify equals identifies unequal objects.""" self.mock_object.ValidCall() self.mock_object._Replay() - self.assertNotEquals(self.mock_object, mox.MockObject(TestClass)) + self.assertNotEqual(self.mock_object, mox.MockObject(TestClass)) def testEqualsInstanceFailure(self): """Verify equals identifies that objects are different instances.""" self.mock_object._Replay() - self.assertNotEquals(self.mock_object, TestClass()) + self.assertNotEqual(self.mock_object, TestClass()) def testNotEquals(self): """Verify not equals works.""" @@ -1115,7 +1115,7 @@ dummy[1].AndReturn('3') dummy._Replay() - self.assertEquals('3', dummy.__getitem__(1)) + self.assertEqual('3', dummy.__getitem__(1)) dummy._Verify() def testMockIter_ExpectedIter_Success(self): @@ -1142,7 +1142,7 @@ dummy._Replay() - self.failUnless('X' in dummy) + self.assertTrue('X' in dummy) dummy._Verify() @@ -1205,7 +1205,7 @@ dummy[2].AndRaise(IndexError) dummy._Replay() - self.assertEquals(['a', 'b'], [x for x in dummy]) + self.assertEqual(['a', 'b'], [x for x in dummy]) dummy._Verify() def testMockIter_ExpectedNoGetItem_NoSuccess(self): @@ -1228,12 +1228,12 @@ dummy = mox.MockObject(TestSubClass) iter(dummy).AndReturn(iter(['a', 'b'])) dummy._Replay() - self.assertEquals(['a', 'b'], [x for x in dummy]) + self.assertEqual(['a', 'b'], [x for x in dummy]) dummy._Verify() def testInstantiationWithAdditionalAttributes(self): mock_object = mox.MockObject(TestClass, attrs={"attr1": "value"}) - self.assertEquals(mock_object.attr1, "value") + self.assertEqual(mock_object.attr1, "value") def testCantOverrideMethodsWithAttributes(self): self.assertRaises(ValueError, mox.MockObject, TestClass, @@ -1292,7 +1292,7 @@ self.mox.ReplayAll() ret_val = mock_obj.ValidCall() - self.assertEquals("yes", ret_val) + self.assertEqual("yes", ret_val) self.mox.VerifyAll() def testSignatureMatchingWithComparatorAsFirstArg(self): @@ -1323,7 +1323,7 @@ self.mox.ReplayAll() ret_val = mock_obj("foo") - self.assertEquals("qux", ret_val) + self.assertEqual("qux", ret_val) self.mox.VerifyAll() def testInheritedCallableObject(self): @@ -1333,7 +1333,7 @@ self.mox.ReplayAll() ret_val = mock_obj("foo") - self.assertEquals("qux", ret_val) + self.assertEqual("qux", ret_val) self.mox.VerifyAll() def testCallOnNonCallableObject(self): @@ -1424,8 +1424,8 @@ actual_one = mock_obj.Method(1) mock_obj.Close() - self.assertEquals(9, actual_one) - self.assertEquals(10, actual_two) + self.assertEqual(9, actual_one) + self.assertEqual(10, actual_two) self.mox.VerifyAll() @@ -1470,10 +1470,10 @@ self.mox.VerifyAll() - self.assertEquals(9, actual_one) - self.assertEquals(9, second_one) # Repeated calls should return same number. - self.assertEquals(10, actual_two) - self.assertEquals(42, actual_three) + self.assertEqual(9, actual_one) + self.assertEqual(9, second_one) # Repeated calls should return same number. + self.assertEqual(10, actual_two) + self.assertEqual(42, actual_three) def testMultipleTimesUsingIsAParameter(self): """Test if MultipleTimesGroup works with a IsA parameter.""" @@ -1490,8 +1490,8 @@ self.mox.VerifyAll() - self.assertEquals(9, actual_one) - self.assertEquals(9, second_one) # Repeated calls should return same number. + self.assertEqual(9, actual_one) + self.assertEqual(9, second_one) # Repeated calls should return same number. def testMutlipleTimesUsingFunc(self): """Test that the Func is not evaluated more times than necessary. @@ -1520,7 +1520,7 @@ self.mox.VerifyAll() - self.assertEquals(2, self.counter) + self.assertEqual(2, self.counter) def testMultipleTimesThreeMethods(self): """Test if MultipleTimesGroup works with three or more methods.""" @@ -1542,10 +1542,10 @@ actual_four = mock_obj.Method(4) mock_obj.Close() - self.assertEquals(9, actual_one) - self.assertEquals(8, actual_two) - self.assertEquals(7, actual_three) - self.assertEquals(10, actual_four) + self.assertEqual(9, actual_one) + self.assertEqual(8, actual_two) + self.assertEqual(7, actual_three) + self.assertEqual(10, actual_four) self.mox.VerifyAll() @@ -1587,8 +1587,8 @@ mock_obj.Method(3) mock_obj.Close() - self.assertEquals(9, actual_one) - self.assertEquals(42, actual_three) + self.assertEqual(9, actual_one) + self.assertEqual(42, actual_three) self.mox.VerifyAll() @@ -1636,7 +1636,7 @@ self.mox.ReplayAll() local_list = ['original'] - self.failUnlessRaises(Exception, + self.assertRaises(Exception, mock_obj.ConfigureInOutParameter, local_list) mock_obj.WorkWithParameter(local_list) @@ -1659,7 +1659,7 @@ self.mox.VerifyAll() self.mox.UnsetStubs() - self.assertEquals('foo', actual) + self.assertEqual('foo', actual) self.assertTrue(type(test_obj.OtherValidCall) is method_type) def testStubOutMethod_Unbound_Comparator(self): @@ -1673,7 +1673,7 @@ self.mox.VerifyAll() self.mox.UnsetStubs() - self.assertEquals('foo', actual) + self.assertEqual('foo', actual) def testStubOutMethod_Unbound_Subclass_Comparator(self): self.mox.StubOutWithMock(mox_test_helper.TestClassFromAnotherModule, @@ -1687,7 +1687,7 @@ self.mox.VerifyAll() self.mox.UnsetStubs() - self.assertEquals('foo', actual) + self.assertEqual('foo', actual) def testStubOuMethod_Unbound_WithOptionalParams(self): self.mox = mox.Mox() @@ -1712,7 +1712,7 @@ self.mox.VerifyAll() self.mox.UnsetStubs() - self.assertEquals('foo', actual) + self.assertEqual('foo', actual) def testStubOutMethod_Unbound_DifferentInstance(self): instance = TestClass() @@ -1773,7 +1773,7 @@ self.mox.VerifyAll() self.mox.UnsetStubs() - self.assertEquals('foo', actual) + self.assertEqual('foo', actual) def testStubOutMethod_Bound_NamedUsingPositional(self): """Check positional parameters can be matched to keyword arguments.""" @@ -1852,7 +1852,7 @@ def testStubOutClass_OldStyle(self): """Test a mocked class whose __init__ returns a Mock.""" self.mox.StubOutWithMock(mox_test_helper, 'TestClassFromAnotherModule') - self.assert_(isinstance(mox_test_helper.TestClassFromAnotherModule, + self.assertTrue(isinstance(mox_test_helper.TestClassFromAnotherModule, mox.MockObject)) mock_instance = self.mox.CreateMock( @@ -1867,7 +1867,7 @@ self.mox.VerifyAll() self.mox.UnsetStubs() - self.assertEquals('mock instance', actual) + self.assertEqual('mock instance', actual) def testStubOutClass(self): self.mox.StubOutClassWithMocks(mox_test_helper, 'CallableClass') @@ -1892,12 +1892,12 @@ self.mox.UnsetStubs() # Verify the correct mocks were returned - self.assertEquals(mock_one, one) - self.assertEquals(mock_two, two) + self.assertEqual(mock_one, one) + self.assertEqual(mock_two, two) # Verify - self.assertEquals('mock', actual_one) - self.assertEquals('called mock', actual_two) + self.assertEqual('mock', actual_one) + self.assertEqual('called mock', actual_two) try: import abc @@ -1923,14 +1923,14 @@ self.mox.UnsetStubs() # Verify the correct mocks were returned - self.assertEquals(mock_foo, foo) - self.assertEquals(mock_spam, spam) + self.assertEqual(mock_foo, foo) + self.assertEqual(mock_spam, spam) # Verify - self.assertEquals('mock bar', actual_foo_bar) - self.assertEquals('called mock', actual_spam) + self.assertEqual('mock bar', actual_foo_bar) + self.assertEqual('called mock', actual_spam) except ImportError: - print >>sys.stderr, "testStubOutClass_ABCMeta. ... Skipped - no abc module" + print("testStubOutClass_ABCMeta. ... Skipped - no abc module", file=sys.stderr) def testStubOutClass_NotAClass(self): self.assertRaises(TypeError, self.mox.StubOutClassWithMocks, @@ -2024,7 +2024,7 @@ foo = Foo() self.mox.StubOutWithMock(foo, "obj") - self.assert_(isinstance(foo.obj, mox.MockObject)) + self.assertTrue(isinstance(foo.obj, mox.MockObject)) foo.obj.ValidCall() self.mox.ReplayAll() @@ -2032,7 +2032,7 @@ self.mox.VerifyAll() self.mox.UnsetStubs() - self.failIf(isinstance(foo.obj, mox.MockObject)) + self.assertFalse(isinstance(foo.obj, mox.MockObject)) def testForgotReplayHelpfulMessage(self): """If there is an AttributeError on a MockMethod, give users a helpful msg. @@ -2045,7 +2045,7 @@ try: foo.GetBar().ShowMeTheMoney() except AttributeError as e: - self.assertEquals('MockMethod has no attribute "ShowMeTheMoney". ' + self.assertEqual('MockMethod has no attribute "ShowMeTheMoney". ' 'Did you remember to put your mocks in replay mode?', str(e)) def testSwallowedUnknownMethodCall(self): @@ -2258,14 +2258,14 @@ self.test_stubs.SmartUnsetAll() self.mox.ReplayAll() self.test.run(result=self.result) - self.failIf(self.result.wasSuccessful()) + self.assertFalse(self.result.wasSuccessful()) self.mox.VerifyAll() def testExpectedNotCalledNoMocks(self): """Let testExpectedNotCalled() unset all the mocks by itself.""" self._CreateTest('testExpectedNotCalled') self.test.run(result=self.result) - self.failIf(self.result.wasSuccessful()) + self.assertFalse(self.result.wasSuccessful()) self.assertEqual(OS_LISTDIR, mox_test_helper.os.listdir) def testUnexpectedCall(self): @@ -2281,7 +2281,7 @@ self.test_stubs.SmartUnsetAll() self.mox.ReplayAll() self.test.run(result=self.result) - self.failIf(self.result.wasSuccessful()) + self.assertFalse(self.result.wasSuccessful()) self.mox.VerifyAll() def testFailure(self): @@ -2297,7 +2297,7 @@ self.test_stubs.SmartUnsetAll() self.mox.ReplayAll() self.test.run(result=self.result) - self.failIf(self.result.wasSuccessful()) + self.assertFalse(self.result.wasSuccessful()) self.mox.VerifyAll() def testMixin(self): @@ -2339,11 +2339,11 @@ self.assertFalse(mock_obj._replay_mode) mock_obj._Replay() self.assertTrue(mock_obj._replay_mode) - self.assertEquals(1, len(mock_obj._expected_calls_queue)) + self.assertEqual(1, len(mock_obj._expected_calls_queue)) mox.Reset(mock_obj) self.assertFalse(mock_obj._replay_mode) - self.assertEquals(0, len(mock_obj._expected_calls_queue)) + self.assertEqual(0, len(mock_obj._expected_calls_queue)) class MyTestCase(unittest.TestCase): @@ -2356,7 +2356,7 @@ def testMethodOverride(self): """Should be properly overriden in a derived class.""" - self.assertEquals(42, self.another_critical_variable) + self.assertEqual(42, self.another_critical_variable) self.another_critical_variable += 1 @@ -2369,15 +2369,15 @@ def testMultipRefactoringTool: Refactored ../python3/mox.py RefactoringTool: Files that were modified: RefactoringTool: ../python3/stubout_testee.py RefactoringTool: ../python3/stubout_test.py RefactoringTool: ../python3/stubout.py RefactoringTool: ../python3/setup.py RefactoringTool: ../python3/mox_test_helper.py RefactoringTool: ../python3/mox_test.py RefactoringTool: ../python3/mox.py leInheritance(self): """Should be able to access members created by all parent setUp().""" - self.assert_(isinstance(self.mox, mox.Mox)) - self.assertEquals(42, self.critical_variable) + self.assertTrue(isinstance(self.mox, mox.Mox)) + self.assertEqual(42, self.critical_variable) def testMethodOverride(self): """Should run before MyTestCase.testMethodOverride.""" - self.assertEquals(99, self.another_critical_variable) + self.assertEqual(99, self.another_critical_variable) self.another_critical_variable = 42 super(MoxTestBaseMultipleInheritanceTest, self).testMethodOverride() - self.assertEquals(43, self.another_critical_variable) + self.assertEqual(43, self.another_critical_variable) class MoxTestDontMockProperties(MoxTestBaseTest): def testPropertiesArentMocked(self): --- ../python3/mox.py (original) +++ ../python3/mox.py (refactored) @@ -259,11 +259,11 @@ ] _use_mock_factory = [type] else: - _use_mock_object = [types.ClassType, types.FunctionType, types.InstanceType, - types.ModuleType, types.ObjectType, types.TypeType, + _use_mock_object = [type, types.FunctionType, types.InstanceType, + types.ModuleType, object, type, types.MethodType, types.UnboundMethodType, ] - _use_mock_factory = [types.ClassType, types.ObjectType, types.TypeType] + _use_mock_factory = [type, object, type] class Mox(object): @@ -523,7 +523,7 @@ method_to_mock=method_to_mock, description=self._description) - def __nonzero__(self): + def __bool__(self): """Return 1 for nonzero so the mock can be used as a conditional.""" return 1 @@ -631,7 +631,7 @@ # Set additional attributes at instantiation time; this is quicker # than manually setting attributes that are normally created in # __init__. - for attr, value in attrs.items(): + for attr, value in list(attrs.items()): if attr.startswith("_"): raise PrivateAttributeError(attr) elif attr in self._known_methods: @@ -899,7 +899,7 @@ class MethodSignatureChecker(object): """Ensures that methods are called correctly.""" - _NEEDED, _DEFAULT, _GIVEN = range(3) + _NEEDED, _DEFAULT, _GIVEN = list(range(3)) def __init__(self, method): """Creates a checker. @@ -1131,7 +1131,7 @@ raise TypeError('MockMethod cannot be iterated. ' 'Did you remember to put your mocks in replay mode?') - def next(self): + def __next__(self): """Raise a TypeError with a helpful message.""" raise TypeError('MockMethod cannot be iterated. ' 'Did you remember to put your mocks in replay mode?') @@ -2098,7 +2098,7 @@ continue d[attr_name] = attr_value - for func_name, func in d.items(): + for func_name, func in list(d.items()): if func_name.startswith('test') and callable(func): setattr(cls, func_name, MoxMetaTestBase.CleanUpTest(cls, func)) @@ -2141,7 +2141,7 @@ return new_method -class MoxTestBase(unittest.TestCase): +class MoxTestBase(unittest.TestCase, metaclass=MoxMetaTestBase): """Convenience test class to make stubbing easier. Sets up a "mox" attribute which is an instance of Mox (any mox tests will @@ -2151,8 +2151,6 @@ code. """ - __metaclass__ = MoxMetaTestBase - def setUp(self): super(MoxTestBase, self).setUp() self.mox = Mox() + exit 0 Executing(%build): /bin/sh -e /usr/src/tmp/rpm-tmp.62308 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd mox-0.5.3 + CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CFLAGS + CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CXXFLAGS + FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export FFLAGS + /usr/bin/python setup.py build running build running build_py creating build creating build/lib copying mox.py -> build/lib copying stubout.py -> build/lib + pushd ../python3 ~/RPM/BUILD/python3 ~/RPM/BUILD/mox-0.5.3 + CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CFLAGS + CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CXXFLAGS + FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export FFLAGS + /usr/bin/python3 setup.py build running build running build_py creating build creating build/lib copying mox.py -> build/lib copying stubout.py -> build/lib + popd ~/RPM/BUILD/mox-0.5.3 + exit 0 Executing(%install): /bin/sh -e /usr/src/tmp/rpm-tmp.62308 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + /bin/chmod -Rf u+rwX -- /usr/src/tmp/python-module-mox-buildroot + : + /bin/rm -rf -- /usr/src/tmp/python-module-mox-buildroot + PATH=/usr/libexec/rpm-build:/usr/src/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games + cd mox-0.5.3 + CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CFLAGS + CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CXXFLAGS + FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export FFLAGS + /usr/bin/python setup.py install --skip-build --root=/usr/src/tmp/python-module-mox-buildroot --force running install running install_lib creating /usr/src/tmp/python-module-mox-buildroot creating /usr/src/tmp/python-module-mox-buildroot/usr creating /usr/src/tmp/python-module-mox-buildroot/usr/lib creating /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7 creating /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages copying build/lib/stubout.py -> /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages copying build/lib/mox.py -> /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages byte-compiling /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/stubout.py to stubout.pyc byte-compiling /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox.py to mox.pyc running install_egg_info Writing /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox-0.5.3-py2.7.egg-info + pushd ../python3 ~/RPM/BUILD/python3 ~/RPM/BUILD/mox-0.5.3 + CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CFLAGS + CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export CXXFLAGS + FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2' + export FFLAGS + /usr/bin/python3 setup.py install --skip-build --root=/usr/src/tmp/python-module-mox-buildroot --force running install running install_lib creating /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3 creating /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages copying build/lib/stubout.py -> /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages copying build/lib/mox.py -> /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages byte-compiling /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/stubout.py to stubout.cpython-37.pyc byte-compiling /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/mox.py to mox.cpython-37.pyc running install_egg_info Writing /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/mox-0.5.3-py3.7.egg-info + popd ~/RPM/BUILD/mox-0.5.3 + /usr/lib/rpm/brp-alt Cleaning files in /usr/src/tmp/python-module-mox-buildroot (auto) Verifying and fixing files in /usr/src/tmp/python-module-mox-buildroot (binconfig,pkgconfig,libtool,desktop,gnuconfig) Checking contents of files in /usr/src/tmp/python-module-mox-buildroot/ (default) Compressing files in /usr/src/tmp/python-module-mox-buildroot (auto) Adjusting library links in /usr/src/tmp/python-module-mox-buildroot ./usr/lib: Verifying ELF objects in /usr/src/tmp/python-module-mox-buildroot (arch=normal,fhs=normal,lfs=relaxed,lint=relaxed,rpath=normal,stack=normal,textrel=normal,unresolved=normal) Bytecompiling python modules in /usr/src/tmp/python-module-mox-buildroot using /usr/bin/python unlink /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox.pyc unlink /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/stubout.pyc compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox.py compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/stubout.py Bytecompiling python modules with optimization in /usr/src/tmp/python-module-mox-buildroot using /usr/bin/python -O compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox.py compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/stubout.py Bytecompiling python3 modules in /usr/src/tmp/python-module-mox-buildroot using /usr/bin/python3 unlink /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/__pycache__/mox.cpython-37.pyc unlink /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.pyc compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/mox.py compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/stubout.py Bytecompiling python3 modules with optimization in /usr/src/tmp/python-module-mox-buildroot using /usr/bin/python3 -O compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/mox.py compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/stubout.py Bytecompiling python3 modules with optimization-2 in /usr/src/tmp/python-module-mox-buildroot using /usr/bin/python3 -OO compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/mox.py compile /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/stubout.py Hardlinking identical .pyc and .opt-?.pyc files './usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.pyc' Hardlinking identical .pyc and .pyo files './usr/lib/python2.7/site-packages/stubout.pyo' => './usr/lib/python2.7/site-packages/stubout.pyc' Processing files: python-module-mox-0.5.3-alt3.git20140721.2 Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.57305 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd mox-0.5.3 + DOCDIR=/usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python-module-mox-0.5.3 + export DOCDIR + rm -rf /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python-module-mox-0.5.3 + /bin/mkdir -p /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python-module-mox-0.5.3 + cp -prL COPYING README /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python-module-mox-0.5.3 + chmod -R go-w /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python-module-mox-0.5.3 + chmod -R a+rX /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python-module-mox-0.5.3 + exit 0 Finding Provides (using /usr/lib/rpm/find-provides) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.ramfCQ find-provides: running scripts (alternatives,debuginfo,lib,pam,perl,pkgconfig,python,python3,shell) Finding Requires (using /usr/lib/rpm/find-requires) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.zPRu4p find-requires: running scripts (cpp,debuginfo,files,lib,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services) /usr/lib/rpm/python.req.py: /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox.py: line=65 IGNORE (for REQ=slight and deep=8) module=abc python.req: /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox.py: hiding stubout, which SEEMS TO BE SELF-SATISFIED shebang.req.files: executable script /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/mox.py is not executable shebang.req.files: executable script /usr/src/tmp/python-module-mox-buildroot/usr/lib/python2.7/site-packages/stubout.py is not executable Provides: python2.7(mox), python2.7(stubout) Requires: python2.7(six), /usr/lib/python2.7/site-packages, python-modules, python2.7(inspect), python2.7(unittest) Processing files: python3-module-mox-0.5.3-alt3.git20140721.2 Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.5481 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd mox-0.5.3 + DOCDIR=/usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python3-module-mox-0.5.3 + export DOCDIR + rm -rf /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python3-module-mox-0.5.3 + /bin/mkdir -p /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python3-module-mox-0.5.3 + cp -prL COPYING README /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python3-module-mox-0.5.3 + chmod -R go-w /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python3-module-mox-0.5.3 + chmod -R a+rX /usr/src/tmp/python-module-mox-buildroot/usr/share/doc/python3-module-mox-0.5.3 + exit 0 Finding Provides (using /usr/lib/rpm/find-provides) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.1CWFH3 find-provides: running scripts (alternatives,debuginfo,lib,pam,perl,pkgconfig,python,python3,shell) Finding Requires (using /usr/lib/rpm/find-requires) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.VikbHK find-requires: running scripts (cpp,debuginfo,files,lib,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services) /usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/mox.py: line=65 IGNORE (for REQ=slight and deep=8) module=abc shebang.req.files: executable script /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/mox.py is not executable shebang.req.files: executable script /usr/src/tmp/python-module-mox-buildroot/usr/lib/python3/site-packages/stubout.py is not executable Provides: python3(mox), python3(stubout) Requires: python3(six) < 0, /usr/lib/python3/site-packages, python3(collections) < 0, python3(difflib) < 0, python3(inspect) < 0, python3(re) < 0, python3(types) < 0, python3(unittest) < 0 Wrote: /usr/src/RPM/RPMS/noarch/python-module-mox-0.5.3-alt3.git20140721.2.noarch.rpm (w2.lzdio) Wrote: /usr/src/RPM/RPMS/noarch/python3-module-mox-0.5.3-alt3.git20140721.2.noarch.rpm (w2.lzdio) 6.68user 0.90system 0:10.19elapsed 74%CPU (0avgtext+0avgdata 59788maxresident)k 0inputs+0outputs (0major+245666minor)pagefaults 0swaps 4.82user 1.95system 0:22.46elapsed 30%CPU (0avgtext+0avgdata 122244maxresident)k 0inputs+0outputs (51956major+269440minor)pagefaults 0swaps --- python3-module-mox-0.5.3-alt3.git20140721.2.noarch.rpm.repo 2018-05-25 10:43:20.000000000 +0000 +++ python3-module-mox-0.5.3-alt3.git20140721.2.noarch.rpm.hasher 2023-05-07 08:29:26.436991385 +0000 @@ -1,9 +1,9 @@ /usr/lib/python3/site-packages/__pycache__ 40755 root:root -/usr/lib/python3/site-packages/__pycache__/mox.cpython-36.opt-1.pyc 100644 root:root -/usr/lib/python3/site-packages/__pycache__/mox.cpython-36.opt-2.pyc 100644 root:root -/usr/lib/python3/site-packages/__pycache__/mox.cpython-36.pyc 100644 root:root -/usr/lib/python3/site-packages/__pycache__/stubout.cpython-36.opt-1.pyc 100644 root:root -/usr/lib/python3/site-packages/__pycache__/stubout.cpython-36.opt-2.pyc 100644 root:root -/usr/lib/python3/site-packages/__pycache__/stubout.cpython-36.pyc 100644 root:root -/usr/lib/python3/site-packages/mox-0.5.3-py3.6.egg-info 100644 root:root +/usr/lib/python3/site-packages/__pycache__/mox.cpython-37.opt-1.pyc 100644 root:root +/usr/lib/python3/site-packages/__pycache__/mox.cpython-37.opt-2.pyc 100644 root:root +/usr/lib/python3/site-packages/__pycache__/mox.cpython-37.pyc 100644 root:root +/usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.opt-1.pyc 100644 root:root +/usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.opt-2.pyc 100644 root:root +/usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.pyc 100644 root:root +/usr/lib/python3/site-packages/mox-0.5.3-py3.7.egg-info 100644 root:root /usr/lib/python3/site-packages/mox.py 100644 root:root @@ -26,9 +26,9 @@ File: /usr/lib/python3/site-packages/__pycache__ 40755 root:root -File: /usr/lib/python3/site-packages/__pycache__/mox.cpython-36.opt-1.pyc 100644 root:root dd563053215930090274d751da11b3ba -File: /usr/lib/python3/site-packages/__pycache__/mox.cpython-36.opt-2.pyc 100644 root:root 1e9f7e34ff9d54bfd15839b542849a2b -File: /usr/lib/python3/site-packages/__pycache__/mox.cpython-36.pyc 100644 root:root d0129b9dfb4dfc642067ce09cf214ffe -File: /usr/lib/python3/site-packages/__pycache__/stubout.cpython-36.opt-1.pyc 100644 root:root 8c1a471c3e96a8a96a91825ac12f86c3 -File: /usr/lib/python3/site-packages/__pycache__/stubout.cpython-36.opt-2.pyc 100644 root:root b4c0bf7890ce09b9b132a78492219333 -File: /usr/lib/python3/site-packages/__pycache__/stubout.cpython-36.pyc 100644 root:root 8c1a471c3e96a8a96a91825ac12f86c3 -File: /usr/lib/python3/site-packages/mox-0.5.3-py3.6.egg-info 100644 root:root 4a2d6e9404d900d862bf44e48434434b +File: /usr/lib/python3/site-packages/__pycache__/mox.cpython-37.opt-1.pyc 100644 root:root ab93e024994dd2c9ad0a9dc8e595f443 +File: /usr/lib/python3/site-packages/__pycache__/mox.cpython-37.opt-2.pyc 100644 root:root b92ba7c2d78e287e8b3839c114435a23 +File: /usr/lib/python3/site-packages/__pycache__/mox.cpython-37.pyc 100644 root:root 90f2151a7912a940154a0cf748586333 +File: /usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.opt-1.pyc 100644 root:root 1bd00dd06fe651b8f9eb0beffc329670 +File: /usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.opt-2.pyc 100644 root:root 659caf7b09ad0902db5a91d62f07a290 +File: /usr/lib/python3/site-packages/__pycache__/stubout.cpython-37.pyc 100644 root:root 1bd00dd06fe651b8f9eb0beffc329670 +File: /usr/lib/python3/site-packages/mox-0.5.3-py3.7.egg-info 100644 root:root 4a2d6e9404d900d862bf44e48434434b File: /usr/lib/python3/site-packages/mox.py 100644 root:root cfa601038ed6fa7df8e7ddd1a5de8f9b @@ -38,2 +38,2 @@ File: /usr/share/doc/python3-module-mox-0.5.3/README 100644 root:root db2f3e6561940e50c7e43a63df2e542d -RPMIdentity: 2d8fa879f4d54d46402f9198b74325374114791111a5e1abcad139490a8aed33c45cc99d5fdf95e15b794499ff790314aa98a16bf68fb6239a04ef7eb3afe677 +RPMIdentity: 7243be4d172b3b4b32058bee40c2d78597532919db49f62f9c71869486b76a9ac853e9d2dc11399f3ac515dc242cf6631625a3a7cd3d66c696d28f21e61e3ef4