Commit 8ff9eec5 authored by Dustin J. Mitchell's avatar Dustin J. Mitchell
Browse files

Bug 1390968: python-3 compatibility for taskcluster/**/*.py; r=Alex_Gaynor,gps 

MozReview-Commit-ID: Hyfn2PlXvhd

--HG--
extra : rebase_source : 504337cd3742c36f37c059ef2b8cd04067f58277
parent 53df6a18

taskcluster/ci/source-test/python-tests.yml

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ python3: 
        using: run-task

        # this will evolve as we get closer and closer to python 3 compatibility. It may

        # eventually be a mach command or shell script.

        command: python3 -mcompileall python/

        command: python3 -mcompileall python/ taskcluster/

    when:

        files-changed:

            - 'python/**/*.py'
 
            - '**/*.py'

taskcluster/taskgraph/test/test_cron_util.py

+8 −8
Original line number Diff line number Diff line
@@ -17,38 +17,38 @@ from taskgraph.cron.util import ( 
class TestMatchUtc(unittest.TestCase):



    def test_hour_minute(self):

        params = {'time': datetime.datetime(2017, 01, 26, 16, 30, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 16, 30, 0)}

        self.assertFalse(match_utc(params, hour=4, minute=30))

        self.assertTrue(match_utc(params, hour=16, minute=30))

        self.assertFalse(match_utc(params, hour=16, minute=0))



    def test_hour_only(self):

        params = {'time': datetime.datetime(2017, 01, 26, 16, 0, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 16, 0, 0)}

        self.assertFalse(match_utc(params, hour=0))

        self.assertFalse(match_utc(params, hour=4))

        self.assertTrue(match_utc(params, hour=16))

        params = {'time': datetime.datetime(2017, 01, 26, 16, 15, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 16, 15, 0)}

        self.assertFalse(match_utc(params, hour=0))

        self.assertFalse(match_utc(params, hour=4))

        self.assertTrue(match_utc(params, hour=16))

        params = {'time': datetime.datetime(2017, 01, 26, 16, 30, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 16, 30, 0)}

        self.assertFalse(match_utc(params, hour=0))

        self.assertFalse(match_utc(params, hour=4))

        self.assertTrue(match_utc(params, hour=16))

        params = {'time': datetime.datetime(2017, 01, 26, 16, 45, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 16, 45, 0)}

        self.assertFalse(match_utc(params, hour=0))

        self.assertFalse(match_utc(params, hour=4))

        self.assertTrue(match_utc(params, hour=16))



    def test_minute_only(self):

        params = {'time': datetime.datetime(2017, 01, 26, 13, 0, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 13, 0, 0)}

        self.assertTrue(match_utc(params, minute=0))

        self.assertFalse(match_utc(params, minute=15))

        self.assertFalse(match_utc(params, minute=30))

        self.assertFalse(match_utc(params, minute=45))



    def test_zeroes(self):

        params = {'time': datetime.datetime(2017, 01, 26, 0, 0, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 0, 0, 0)}

        self.assertTrue(match_utc(params, minute=0))

        self.assertTrue(match_utc(params, hour=0))

        self.assertFalse(match_utc(params, hour=1))
@@ -57,7 +57,7 @@ class TestMatchUtc(unittest.TestCase): 
        self.assertFalse(match_utc(params, minute=45))



    def test_invalid_minute(self):

        params = {'time': datetime.datetime(2017, 01, 26, 13, 0, 0)}

        params = {'time': datetime.datetime(2017, 1, 26, 13, 0, 0)}

        self.assertRaises(Exception, lambda:

                          match_utc(params, minute=1))

taskcluster/taskgraph/test/test_util_parameterization.py

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ from taskgraph.util.parameterization import ( 
class TestTimestamps(unittest.TestCase):



    def test_no_change(self):

        now = datetime.datetime(2018, 01, 01)

        now = datetime.datetime(2018, 1, 1)

        input = {

            "key": "value",

            "numeric": 10,
@@ -26,13 +26,13 @@ class TestTimestamps(unittest.TestCase): 
        self.assertEqual(resolve_timestamps(now, input), input)



    def test_buried_replacement(self):

        now = datetime.datetime(2018, 01, 01)

        now = datetime.datetime(2018, 1, 1)

        input = {"key": [{"key2": [{'relative-datestamp': '1 day'}]}]}

        self.assertEqual(resolve_timestamps(now, input),

                         {"key": [{"key2": ['2018-01-02T00:00:00Z']}]})



    def test_appears_with_other_keys(self):

        now = datetime.datetime(2018, 01, 01)

        now = datetime.datetime(2018, 1, 1)

        input = [{'relative-datestamp': '1 day', 'another-key': True}]

        self.assertEqual(resolve_timestamps(now, input),

                         [{'relative-datestamp': '1 day', 'another-key': True}])

taskcluster/taskgraph/test/test_util_schema.py

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class TestValidateSchema(unittest.TestCase): 
        try:

            validate_schema(schema, {'x': 'not-int'}, "pfx")

            self.fail("no exception raised")

        except Exception, e:

        except Exception as e:

            self.failUnless(str(e).startswith("pfx\n"))