From ab1aba82f9c59f47ca5981267b467800c6ec2618 Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 13:53:00 +0100 Subject: [PATCH 1/8] Adding travis file --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..e3f28d2 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: python +script: + - pytest \ No newline at end of file From 9dd20124018628f9318320644f45bbda3ea0798f Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 14:11:55 +0100 Subject: [PATCH 2/8] Adding docstrings --- clock.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clock.py b/clock.py index aa91912..c019fc9 100644 --- a/clock.py +++ b/clock.py @@ -1,5 +1,8 @@ import time +""" +This is a mechanism to tell the time +""" def whats_the_time(): return time.time() \ No newline at end of file From e945cc0e9a0ab696f9773f54808294e6bc11f474 Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 14:21:59 +0100 Subject: [PATCH 3/8] changing python version to 3.6 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e3f28d2..0b02bd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ language: python +python: + - 3.6 script: - pytest \ No newline at end of file From fcf4595c61632cdd686387f245618e3aec62ccb1 Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 14:29:25 +0100 Subject: [PATCH 4/8] changing script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b02bd4..717d9bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: python python: - 3.6 script: - - pytest \ No newline at end of file + - pytest -m unittest discover test \ No newline at end of file From 836e9b5acd1f5406bd8bba5742556c0e40dcfc4e Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 14:32:10 +0100 Subject: [PATCH 5/8] changing script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 717d9bf..4fcaee2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: python python: - 3.6 script: - - pytest -m unittest discover test \ No newline at end of file + - python -m unittest discover test \ No newline at end of file From d174d41e224295dceb2c5a66101779bb2ca54ef4 Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 14:58:03 +0100 Subject: [PATCH 6/8] changing title --- test/{TestClock.py => test_clock.py} | 0 test/{TestWithMock.py => test_with_mock.py} | 0 test/{TestWithPatch.py => test_with_patch.py} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename test/{TestClock.py => test_clock.py} (100%) rename test/{TestWithMock.py => test_with_mock.py} (100%) rename test/{TestWithPatch.py => test_with_patch.py} (100%) diff --git a/test/TestClock.py b/test/test_clock.py similarity index 100% rename from test/TestClock.py rename to test/test_clock.py diff --git a/test/TestWithMock.py b/test/test_with_mock.py similarity index 100% rename from test/TestWithMock.py rename to test/test_with_mock.py diff --git a/test/TestWithPatch.py b/test/test_with_patch.py similarity index 100% rename from test/TestWithPatch.py rename to test/test_with_patch.py From 85a5e3aab6628d7e4ee1993e038af2cedddb537c Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 15:10:45 +0100 Subject: [PATCH 7/8] making fail --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4fcaee2..717d9bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: python python: - 3.6 script: - - python -m unittest discover test \ No newline at end of file + - pytest -m unittest discover test \ No newline at end of file From f9d4b75d4a9297a97c5a2f3b43d6846eb4751c22 Mon Sep 17 00:00:00 2001 From: Anna Carbery Date: Thu, 24 Oct 2019 15:31:20 +0100 Subject: [PATCH 8/8] making succeed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 717d9bf..4fcaee2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: python python: - 3.6 script: - - pytest -m unittest discover test \ No newline at end of file + - python -m unittest discover test \ No newline at end of file