commit 7f1f8be658da9d0940810eed2a95fa15267f372a Author: Damian Johnson atagar@torproject.org Date: Sun Dec 21 15:47:49 2014 -0800

assertDictEqual is unavailable in python 2.6

Sweet, only one minor regression for python 2.6. assertDictEqual was added in python 2.7, and running it is actually discouraged since under the covers assertEqual uses it...

https://docs.python.org/2/library/unittest.html#unittest.TestCase.assertDict... --- test/integ/control/controller.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index b6d7036..cd0b578 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -476,12 +476,12 @@ class TestController(unittest.TestCase): try: # initially we shouldn't be running any hidden services

- self.assertDictEqual({}, controller.get_hidden_service_conf()) + self.assertEqual({}, controller.get_hidden_service_conf())

# try setting a blank config, shouldn't have any impact

controller.set_hidden_service_conf({}) - self.assertDictEqual({}, controller.get_hidden_service_conf()) + self.assertEqual({}, controller.get_hidden_service_conf())

# create a hidden service

@@ -507,13 +507,13 @@ class TestController(unittest.TestCase): }

controller.set_hidden_service_conf(initialconf) - self.assertDictEqual(initialconf, controller.get_hidden_service_conf()) + self.assertEqual(initialconf, controller.get_hidden_service_conf())

# add already existing services, with/without explicit target

self.assertEqual(None, controller.create_hidden_service(service1_path, 8020)) self.assertEqual(None, controller.create_hidden_service(service1_path, 8021, target_port = 8021)) - self.assertDictEqual(initialconf, controller.get_hidden_service_conf()) + self.assertEqual(initialconf, controller.get_hidden_service_conf())

# add a new service, with/without explicit target