From e1b3b7a0adaf4d2e98eefb50b6ee9f305fb6efd4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 1 Jul 2014 11:45:58 +0530 Subject: [PATCH 01/82] Update shippable.yml --- shippable.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 3bdcdf82..34e81b8e 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,8 +1,13 @@ language: python python: + - 2.6 - 2.7 - + - 3.2 + - 3.3 + - 3.4 + - pypy + install: - pip install -r requirements.txt @@ -14,4 +19,8 @@ before_script: script: - nosetests test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - which python && coverage run --branch test.py - - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py \ No newline at end of file + - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py + +notifications: + email: + - exampleone@org.com From de9d2fdb6383dbaa8cf63b4c5897b1fa5ea68b71 Mon Sep 17 00:00:00 2001 From: Patrick Ellis Date: Tue, 22 Jul 2014 11:48:12 -0700 Subject: [PATCH 02/82] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ec522d27..0f675189 100755 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ Python Sample ===================== Simple Python sample with tests using Nose and Coverage. + +This sample is built for Shippable, a docker based continuous integration and deployment platform. From bbf732f772dfa47312784cc11d1a262d5a8fd2ac Mon Sep 17 00:00:00 2001 From: ragsden Date: Thu, 16 Oct 2014 12:29:57 -0700 Subject: [PATCH 03/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 34e81b8e..eda56114 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,5 @@ language: python - +build_image: shippableimages/ubuntu1204_python python: - 2.6 - 2.7 From 087c930c418ea0aa9410a48ac5cf594ebf89efd1 Mon Sep 17 00:00:00 2001 From: Brent O'Connor Date: Thu, 25 Jun 2015 10:15:14 -0500 Subject: [PATCH 04/82] Fixed tests getting run twice Currently tests are getting run twice, when they only need to be run once. I also added .coveragerc file to control coverage settings. --- .coveragerc | 9 +++++++++ .gitignore | 2 ++ shippable.yml | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 .coveragerc create mode 100644 .gitignore diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 00000000..34a1bebf --- /dev/null +++ b/.coveragerc @@ -0,0 +1,9 @@ +# .coveragerc to control coverage + +[run] +branch = True + +source = . + +[html] +directory = htmlcov diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..89437a9d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.coverage +shippable/ diff --git a/shippable.yml b/shippable.yml index eda56114..64c88347 100755 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,7 @@ python: - 3.3 - 3.4 - pypy - + install: - pip install -r requirements.txt @@ -17,9 +17,9 @@ before_script: - mkdir -p shippable/codecoverage script: - - nosetests test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - - which python && coverage run --branch test.py - - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py + - which python + - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml + - coverage xml -o shippable/codecoverage/coverage.xml notifications: email: From 847c81399ece7d613eeb2f899322be1324e590d6 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 15:35:11 +0530 Subject: [PATCH 05/82] Update shippable.yml --- shippable.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 64c88347..4dcbdece 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,12 +1,19 @@ language: python -build_image: shippableimages/ubuntu1204_python +#build_image: shippableimages/ubuntu1204_python + +env: + - FOO=ree BAR=test + - REE=foo TEST=bar + python: - 2.6 - 2.7 - 3.2 - 3.3 - 3.4 + - 3.5 - pypy + - pypy3 install: - pip install -r requirements.txt @@ -23,4 +30,4 @@ script: notifications: email: - - exampleone@org.com + - shiphitchcock1@gmail.com From 74578278d3f0c4874de7623c538b701dc828589e Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 15:46:45 +0530 Subject: [PATCH 06/82] Update shippable.yml --- shippable.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 4dcbdece..8a310998 100755 --- a/shippable.yml +++ b/shippable.yml @@ -2,8 +2,9 @@ language: python #build_image: shippableimages/ubuntu1204_python env: - - FOO=ree BAR=test - - REE=foo TEST=bar + global: + - FOO=ree BAR=test + - REE=foo TEST=bar python: - 2.6 @@ -27,6 +28,10 @@ script: - which python - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - coverage xml -o shippable/codecoverage/coverage.xml + - echo "$FOO" + - echo "$BAR" + - echo "$REE" + - echo "$TEST" notifications: email: From de3c91850aabd3e542490e4c6686afeb2cdced2e Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 15:59:07 +0530 Subject: [PATCH 07/82] Update shippable.yml --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 8a310998..ba6ea005 100755 --- a/shippable.yml +++ b/shippable.yml @@ -2,9 +2,9 @@ language: python #build_image: shippableimages/ubuntu1204_python env: - global: - - FOO=ree BAR=test - - REE=foo TEST=bar + #global: + # - FOO=ree BAR=test + - REE=foo TEST=bar python: - 2.6 From 0f33bc25ef79fdb20eefd05fc0162f724fdba230 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 16:06:14 +0530 Subject: [PATCH 08/82] Update shippable.yml --- shippable.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/shippable.yml b/shippable.yml index ba6ea005..a31e9238 100755 --- a/shippable.yml +++ b/shippable.yml @@ -5,6 +5,13 @@ env: #global: # - FOO=ree BAR=test - REE=foo TEST=bar + +matrix: + include: + - python: 3.4 + env: FOO=ree BAR=test + exclude: + - python: 3.2 python: - 2.6 From 3f26dec3e01f51198322331c32cd9c67bd7f4604 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 16:27:46 +0530 Subject: [PATCH 09/82] Update shippable.yml --- shippable.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/shippable.yml b/shippable.yml index a31e9238..48de9377 100755 --- a/shippable.yml +++ b/shippable.yml @@ -7,20 +7,17 @@ env: - REE=foo TEST=bar matrix: - include: - - python: 3.4 - env: FOO=ree BAR=test - exclude: - - python: 3.2 + - FOO=ree + - BAR=test python: - 2.6 - 2.7 - - 3.2 + #- 3.2 - 3.3 - 3.4 - 3.5 - - pypy + #- pypy - pypy3 install: From 01e464fa8512cd6e00ba73b0c3944dad6797b430 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 18:08:52 +0530 Subject: [PATCH 10/82] Update shippable.yml --- shippable.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 48de9377..60b04ac1 100755 --- a/shippable.yml +++ b/shippable.yml @@ -2,8 +2,6 @@ language: python #build_image: shippableimages/ubuntu1204_python env: - #global: - # - FOO=ree BAR=test - REE=foo TEST=bar matrix: @@ -13,11 +11,11 @@ matrix: python: - 2.6 - 2.7 - #- 3.2 + - 3.2 - 3.3 - 3.4 - 3.5 - #- pypy + - pypy - pypy3 install: From 8310a9485499f9dd2e0f387040c61a4e7b6aa876 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 18:20:59 +0530 Subject: [PATCH 11/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 60b04ac1..389e1228 100755 --- a/shippable.yml +++ b/shippable.yml @@ -37,4 +37,4 @@ script: notifications: email: - - shiphitchcock1@gmail.com + - shiphitchcock1@gmail.com From 359280cc20f73c8eb53f6a0eefc5bf6e3ef43840 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 18:24:28 +0530 Subject: [PATCH 12/82] Update shippable.yml --- shippable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 389e1228..44901aa3 100755 --- a/shippable.yml +++ b/shippable.yml @@ -5,8 +5,7 @@ env: - REE=foo TEST=bar matrix: - - FOO=ree - - BAR=test + - FOO=ree BAR=test python: - 2.6 From 8b4db225bd5fdbd0a63bf6c379329a1445baac17 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 18:30:48 +0530 Subject: [PATCH 13/82] Update shippable.yml --- shippable.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 44901aa3..18a3b543 100755 --- a/shippable.yml +++ b/shippable.yml @@ -5,7 +5,9 @@ env: - REE=foo TEST=bar matrix: - - FOO=ree BAR=test + include: + python: 3.3 + env: FOO=ree BAR=test python: - 2.6 From e337cec4747519eecc5b449ef2d9d8f0909cab63 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 19 Feb 2016 18:46:09 +0530 Subject: [PATCH 14/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 18a3b543..b368c002 100755 --- a/shippable.yml +++ b/shippable.yml @@ -38,4 +38,4 @@ script: notifications: email: - - shiphitchcock1@gmail.com + - shiphitchcock1@gmail.com From 76b3cd3d8c525c6bc0405da1bca6405fcc9ef61c Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Sat, 20 Feb 2016 14:21:43 +0530 Subject: [PATCH 15/82] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index b368c002..687ecd4a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -6,8 +6,8 @@ env: matrix: include: - python: 3.3 - env: FOO=ree BAR=test + - python: 3.3 + env: FOO=ree BAR=test python: - 2.6 From d1c8da8a1c439bebc2c3bd2d506df385f392c038 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 22 Feb 2016 16:30:47 +0530 Subject: [PATCH 16/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 687ecd4a..49c6d3e2 100755 --- a/shippable.yml +++ b/shippable.yml @@ -38,4 +38,4 @@ script: notifications: email: - - shiphitchcock1@gmail.com + - shiphitchcock1@gmail.com From 78e0eb161aa90a489c0a1ef65b7f3241252cca60 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 22 Feb 2016 16:46:57 +0530 Subject: [PATCH 17/82] Update shippable.yml --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 49c6d3e2..e105cd24 100755 --- a/shippable.yml +++ b/shippable.yml @@ -11,12 +11,12 @@ matrix: python: - 2.6 - - 2.7 +# - 2.7 - 3.2 - 3.3 - - 3.4 +# - 3.4 - 3.5 - - pypy +# - pypy - pypy3 install: From e6bac0f68cea457de6951820f9f526d065bb4085 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 22 Feb 2016 17:35:02 +0530 Subject: [PATCH 18/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index e105cd24..e5da80f1 100755 --- a/shippable.yml +++ b/shippable.yml @@ -38,4 +38,4 @@ script: notifications: email: - - shiphitchcock1@gmail.com + - shiphitchcock1@gmail.com From 6bc4551d06d8d78bf371bb730c33cf866891df05 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 21 Apr 2016 18:46:31 +0530 Subject: [PATCH 19/82] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index e5da80f1..b4e033f5 100755 --- a/shippable.yml +++ b/shippable.yml @@ -39,3 +39,4 @@ script: notifications: email: - shiphitchcock1@gmail.com + From a3ce55a3948759f73687168d0cc7321493a0366e Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 19 Apr 2017 12:11:56 +0530 Subject: [PATCH 20/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index b4e033f5..2bfcccc5 100755 --- a/shippable.yml +++ b/shippable.yml @@ -12,7 +12,7 @@ matrix: python: - 2.6 # - 2.7 - - 3.2 + # - 3.2 - 3.3 # - 3.4 - 3.5 From 7ea3f56d5bf2c59a920c335985ec3ffa6940a508 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 20 Apr 2017 15:14:45 +0530 Subject: [PATCH 21/82] Update shippable.yml --- shippable.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 2bfcccc5..c4718d5b 100755 --- a/shippable.yml +++ b/shippable.yml @@ -36,7 +36,15 @@ script: - echo "$REE" - echo "$TEST" -notifications: - email: - - shiphitchcock1@gmail.com - +integrations: + notifications: + - integrationName: email + type: email + recipients: + - shiptest.rc.ow@gmail.com + - shiptest.rc.me@gmail.com + sendConsoleLogs : true + sendCoverageReports : true + on_start: always + on_success: always + on_failure: always From b8b487c095e05419a3e11e6bf3cd944bf59d523d Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 20 Apr 2017 15:37:19 +0530 Subject: [PATCH 22/82] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index c4718d5b..dac8ea80 100755 --- a/shippable.yml +++ b/shippable.yml @@ -35,6 +35,7 @@ script: - echo "$BAR" - echo "$REE" - echo "$TEST" + - sleep 8m integrations: notifications: From 6ffb726f36f4f9c5392f5e7e09dcc33315fb911a Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 20 Apr 2017 15:46:54 +0530 Subject: [PATCH 23/82] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index dac8ea80..9384595a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -35,6 +35,7 @@ script: - echo "$BAR" - echo "$REE" - echo "$TEST" + # - cs ps - sleep 8m integrations: From 5b3d89c7642bc788d80591922e4dd1f7d3dc8dd2 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 20 Apr 2017 15:47:17 +0530 Subject: [PATCH 24/82] Update shippable.yml --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 9384595a..3f58387d 100755 --- a/shippable.yml +++ b/shippable.yml @@ -13,11 +13,11 @@ python: - 2.6 # - 2.7 # - 3.2 - - 3.3 +## - 3.3 # - 3.4 - - 3.5 +## - 3.5 # - pypy - - pypy3 +## - pypy3 install: - pip install -r requirements.txt From 57165a5b3bcfd541466dc77dd185cc927e40d9bd Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 20 Apr 2017 16:34:08 +0530 Subject: [PATCH 25/82] Update shippable.yml --- shippable.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shippable.yml b/shippable.yml index 3f58387d..45160413 100755 --- a/shippable.yml +++ b/shippable.yml @@ -4,10 +4,10 @@ language: python env: - REE=foo TEST=bar -matrix: - include: - - python: 3.3 - env: FOO=ree BAR=test +#matrix: +# include: + # - python: 3.3 + # env: FOO=ree BAR=test python: - 2.6 @@ -35,8 +35,8 @@ script: - echo "$BAR" - echo "$REE" - echo "$TEST" - # - cs ps - - sleep 8m + - cs ps + # - sleep 8m integrations: notifications: From 528806cca1e2b3d142e19c7a8713dbf35a2e1a24 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 20 Apr 2017 16:47:17 +0530 Subject: [PATCH 26/82] Update shippable.yml --- shippable.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/shippable.yml b/shippable.yml index 45160413..d30b1e7d 100755 --- a/shippable.yml +++ b/shippable.yml @@ -4,20 +4,20 @@ language: python env: - REE=foo TEST=bar -#matrix: -# include: - # - python: 3.3 - # env: FOO=ree BAR=test +matrix: + include: + - python: 3.3 + env: FOO=ree BAR=test python: - 2.6 # - 2.7 # - 3.2 -## - 3.3 + - 3.3 # - 3.4 -## - 3.5 + - 3.5 # - pypy -## - pypy3 + - pypy3 install: - pip install -r requirements.txt From 0e264f9a388adf2a9d8b5f03942065b0e9008bef Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 2 Jun 2017 15:45:30 +0530 Subject: [PATCH 27/82] Update shippable.yml --- shippable.yml | 95 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 15 deletions(-) diff --git a/shippable.yml b/shippable.yml index d30b1e7d..eea45788 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,23 +1,23 @@ language: python #build_image: shippableimages/ubuntu1204_python -env: - - REE=foo TEST=bar +#env: + # - REE=foo TEST=bar -matrix: - include: - - python: 3.3 - env: FOO=ree BAR=test +#matrix: + # include: + # - python: 3.3 + # env: FOO=ree BAR=test python: - - 2.6 + # - 2.6 # - 2.7 # - 3.2 - - 3.3 + # - 3.3 # - 3.4 - 3.5 # - pypy - - pypy3 + #- pypy3 install: - pip install -r requirements.txt @@ -35,18 +35,83 @@ script: - echo "$BAR" - echo "$REE" - echo "$TEST" - - cs ps + # - cs ps # - sleep 8m integrations: notifications: + - integrationName: notify-slack + type: slack + recipients: + - "#random" + - "#rc-public" + - "#rc-private" + on_start: always + on_success: change + on_failure: change + on_cancel: change + - integrationName: email type: email - recipients: + recipients: - shiptest.rc.ow@gmail.com - shiptest.rc.me@gmail.com - sendConsoleLogs : true - sendCoverageReports : true + # sendConsoleLogs : true + # sendCoverageReports : true + on_start: always + on_success: change + on_failure: change + on_cancel: change + + - integrationName: irc + type: irc + recipients: + - "chat.freenode.net#test-rc" + - "webchat.irchighway.net#test-rc" + on_start: always + on_success: change + on_failure: change + on_cancel: change + + - integrationName: notify-hipchat + type: hipchat + recipients: + - '#rc-private' + - '#rc-public' + - '@shiptestrcow' + on_start: always + on_success: change + on_failure: change + on_cancel: change + + - integrationName: generic-webhook #issue will get created in github samleNod project + type: webhook + payload: + - title=Failure - $REPO_FULL_NAME - $BUILD_NUMBER + - body=Shippable Run $BUILD_NUMBER ($BUILD_URL) failed for $COMPARE_URL + on_start: always + on_success: change + on_failure: change + on_cancel: change + + - integrationName: project-trigger #samplNod project in shiptest-rc-ow will trigger + type: webhook + payload: + # - BUILD_NUM=$SHIPPABLE_JOB_NUMBER + - BUILD_NUM=$SHIPPABLE_BUILD_NUMBER + - FOO=FUBU + - GOO=GUBU + on_start: always + on_success: change + on_failure: change + on_cancel: change + + - integrationName: resource-trigger + type: webhook + payload: + - versionName=Shippable Run $BUILD_NUMBER on_start: always - on_success: always - on_failure: always + on_success: change + on_failure: change + on_cancel: change + From 3fefc75859202ac193bf1b61164f6013f381e656 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 2 Jun 2017 15:55:19 +0530 Subject: [PATCH 28/82] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index eea45788..40af8a98 100755 --- a/shippable.yml +++ b/shippable.yml @@ -114,4 +114,3 @@ integrations: on_success: change on_failure: change on_cancel: change - From df009eb2811ff48fe5ea13b8c668b941ee28793f Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 2 Jun 2017 16:06:26 +0530 Subject: [PATCH 29/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 40af8a98..fa8f4b68 100755 --- a/shippable.yml +++ b/shippable.yml @@ -36,7 +36,7 @@ script: - echo "$REE" - echo "$TEST" # - cs ps - # - sleep 8m + - sleep 2m integrations: notifications: From 4ed8fca248b030ac7243e03dc7001f2a3a8cf0c7 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 7 Jun 2017 18:23:28 +0530 Subject: [PATCH 30/82] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0f675189..b53f21b5 100755 --- a/README.md +++ b/README.md @@ -4,3 +4,7 @@ Python Sample Simple Python sample with tests using Nose and Coverage. This sample is built for Shippable, a docker based continuous integration and deployment platform. + +[![Run Status](https://rcapi.shippable.com/projects/5809c5873388de0e00d535ed/badge?branch=master)](https://rcapp.shippable.com/github/shiphitchcock1/sample_python) + +[![Coverage Badge](https://rcapi.shippable.com/projects/5809c5873388de0e00d535ed/coverageBadge?branch=master)](https://rcapp.shippable.com/github/shiphitchcock1/sample_python) From 7ac9f127e87ca39576b06107d42ebff9a6b50f89 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 12 Jun 2017 17:35:07 +0530 Subject: [PATCH 31/82] Create shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index fa8f4b68..8d50824c 100755 --- a/shippable.yml +++ b/shippable.yml @@ -36,7 +36,7 @@ script: - echo "$REE" - echo "$TEST" # - cs ps - - sleep 2m + - sleep 8m integrations: notifications: From d0fb67d3b3df601177dbd70ae9dbbe7fe105454b Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 12 Jun 2017 17:36:31 +0530 Subject: [PATCH 32/82] Create shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 8d50824c..4ec74bbb 100755 --- a/shippable.yml +++ b/shippable.yml @@ -36,7 +36,6 @@ script: - echo "$REE" - echo "$TEST" # - cs ps - - sleep 8m integrations: notifications: From fb3e306f2970aa1fedfa3c53e00e739d03799b0b Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 12:45:09 +0530 Subject: [PATCH 33/82] Update shippable.yml --- shippable.yml | 46 +--------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/shippable.yml b/shippable.yml index 4ec74bbb..3f64f076 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,14 +1,6 @@ language: python #build_image: shippableimages/ubuntu1204_python -#env: - # - REE=foo TEST=bar - -#matrix: - # include: - # - python: 3.3 - # env: FOO=ree BAR=test - python: # - 2.6 # - 2.7 @@ -16,7 +8,7 @@ python: # - 3.3 # - 3.4 - 3.5 -# - pypy + # - pypy #- pypy3 install: @@ -31,11 +23,6 @@ script: - which python - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - coverage xml -o shippable/codecoverage/coverage.xml - - echo "$FOO" - - echo "$BAR" - - echo "$REE" - - echo "$TEST" - # - cs ps integrations: notifications: @@ -82,34 +69,3 @@ integrations: on_success: change on_failure: change on_cancel: change - - - integrationName: generic-webhook #issue will get created in github samleNod project - type: webhook - payload: - - title=Failure - $REPO_FULL_NAME - $BUILD_NUMBER - - body=Shippable Run $BUILD_NUMBER ($BUILD_URL) failed for $COMPARE_URL - on_start: always - on_success: change - on_failure: change - on_cancel: change - - - integrationName: project-trigger #samplNod project in shiptest-rc-ow will trigger - type: webhook - payload: - # - BUILD_NUM=$SHIPPABLE_JOB_NUMBER - - BUILD_NUM=$SHIPPABLE_BUILD_NUMBER - - FOO=FUBU - - GOO=GUBU - on_start: always - on_success: change - on_failure: change - on_cancel: change - - - integrationName: resource-trigger - type: webhook - payload: - - versionName=Shippable Run $BUILD_NUMBER - on_start: always - on_success: change - on_failure: change - on_cancel: change From e40a5d2673bd22e5f551059a9afb6b719c6ecdbe Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 12:48:46 +0530 Subject: [PATCH 34/82] Update app.py --- app.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app.py b/app.py index b3cf7d91..dcf82f90 100644 --- a/app.py +++ b/app.py @@ -8,7 +8,21 @@ def calculate(self): def retrieve(self): return self.result +class App2(): + def __init__(self): + self.var2 = 15 + + def calculate(self): + self.result = self.var2 * 4 + 1 + + def retrieve(self): + return self.result + if __name__ == "__main__": app = App() app.calculate() print(app.retrieve) + + app = App2() + app.calculate() + print(app.retrieve) From e9e8677739d09e66b1dc1575f4078cd6f7009372 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 12:48:52 +0530 Subject: [PATCH 35/82] Update test.py --- test.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test.py b/test.py index e090dee3..24fa3c42 100755 --- a/test.py +++ b/test.py @@ -7,7 +7,11 @@ def test(self): app = App() app.calculate() self.failIf(app.retrieve() != 62) - + + def test(self): + app = App2() + app.calculate() + self.failIf(app.retrieve() != 61) def main(): unittest.main() From 0d5a61cb7c807ba666720a844a93012fc2814f20 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 12:51:11 +0530 Subject: [PATCH 36/82] Update test.py --- test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.py b/test.py index 24fa3c42..da69c224 100755 --- a/test.py +++ b/test.py @@ -7,7 +7,9 @@ def test(self): app = App() app.calculate() self.failIf(app.retrieve() != 62) - + +from app import App2 + def test(self): app = App2() app.calculate() From b1d264e2568cba1e71d98f71ba84e60684f786f9 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 12:53:00 +0530 Subject: [PATCH 37/82] Update test.py --- test.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test.py b/test.py index da69c224..164bfe4e 100755 --- a/test.py +++ b/test.py @@ -7,13 +7,6 @@ def test(self): app = App() app.calculate() self.failIf(app.retrieve() != 62) - -from app import App2 - - def test(self): - app = App2() - app.calculate() - self.failIf(app.retrieve() != 61) def main(): unittest.main() From 5bc023921a6d6b576b3df63ba9235949a8a661bf Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 12:54:12 +0530 Subject: [PATCH 38/82] Create test2.py --- test2.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 test2.py diff --git a/test2.py b/test2.py new file mode 100644 index 00000000..84260a04 --- /dev/null +++ b/test2.py @@ -0,0 +1,15 @@ +import unittest +from app import App2 + +class TestSuite(unittest.TestCase): + + def test(self): + app = App2() + app.calculate() + self.failIf(app.retrieve() != 61) + +def main(): + unittest.main() + +if __name__ == "__main__": + main() From 66ca6b1a57e43fccf6e26e672aa600a171204970 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 12:54:46 +0530 Subject: [PATCH 39/82] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 3f64f076..93f14553 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,6 +22,7 @@ before_script: script: - which python - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml + - coverage run `which nosetests` test2.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - coverage xml -o shippable/codecoverage/coverage.xml integrations: From 535b0f964f77617604b42e2d3fc684e073e2607e Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:02:39 +0530 Subject: [PATCH 40/82] Update app.py --- app.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app.py b/app.py index dcf82f90..b3cf7d91 100644 --- a/app.py +++ b/app.py @@ -8,21 +8,7 @@ def calculate(self): def retrieve(self): return self.result -class App2(): - def __init__(self): - self.var2 = 15 - - def calculate(self): - self.result = self.var2 * 4 + 1 - - def retrieve(self): - return self.result - if __name__ == "__main__": app = App() app.calculate() print(app.retrieve) - - app = App2() - app.calculate() - print(app.retrieve) From 862c7fd0a35edda79832e6b7166febd2a59d2958 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:02:52 +0530 Subject: [PATCH 41/82] Create app2.py --- app2.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 app2.py diff --git a/app2.py b/app2.py new file mode 100644 index 00000000..a47f74c1 --- /dev/null +++ b/app2.py @@ -0,0 +1,15 @@ +class App2(): + def __init__(self): + self.var2 = 15 + + def calculate(self): + self.result = self.var2 * 4 + 1 + + def retrieve(self): + return self.result + +if __name__ == "__main__": + app = App2() + app.calculate() + print(app.retrieve) + From df513a172aef95b51e13874f2abf518c35e95d52 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:06:32 +0530 Subject: [PATCH 42/82] Update test2.py --- test2.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test2.py b/test2.py index 84260a04..d48dd06a 100644 --- a/test2.py +++ b/test2.py @@ -1,12 +1,12 @@ import unittest -from app import App2 +from app2 import App2 class TestSuite(unittest.TestCase): def test(self): - app = App2() - app.calculate() - self.failIf(app.retrieve() != 61) + app2 = App2() + app2.calculate() + self.failIf(app2.retrieve() != 61) def main(): unittest.main() From b6061790b7aad14fea8000e2a8b3d203933b5a63 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:08:59 +0530 Subject: [PATCH 43/82] Update app.py --- app.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app.py b/app.py index b3cf7d91..537ff135 100644 --- a/app.py +++ b/app.py @@ -7,6 +7,18 @@ def calculate(self): def retrieve(self): return self.result + + def __init__(self): + self.var2 = 16 + + def calculate(self): + self.result = self.var2 * 4 + 2 + + def __init__(self): + self.var3 = 17 + + def calculate(self): + self.result = self.var3 * 4 + 2 if __name__ == "__main__": app = App() From 513a615932b746a5871cbfc66b89385e5dcc8691 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:11:48 +0530 Subject: [PATCH 44/82] Update app.py --- app.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index 537ff135..684a53c4 100644 --- a/app.py +++ b/app.py @@ -3,24 +3,32 @@ def __init__(self): self.var1 = 15 def calculate(self): - self.result = self.var1 * 4 + 2 + self.result1 = self.var1 * 4 + 2 - def retrieve(self): - return self.result + def retrieve1(self): + return self.result1 def __init__(self): self.var2 = 16 def calculate(self): - self.result = self.var2 * 4 + 2 - + self.result2 = self.var2 * 4 + 2 + + def retrieve2(self): + return self.result2 + def __init__(self): self.var3 = 17 def calculate(self): - self.result = self.var3 * 4 + 2 - + self.result3 = self.var3 * 4 + 2 + + def retrieve1(self): + return self.result3 + if __name__ == "__main__": app = App() app.calculate() - print(app.retrieve) + print(app.retrieve1) + print(app.retrieve2) + print(app.retrieve3) From e0cfa7d2c9ccf07e9b0859fec9c1131ada944127 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:13:08 +0530 Subject: [PATCH 45/82] Update test.py --- test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.py b/test.py index 164bfe4e..f65a5fb7 100755 --- a/test.py +++ b/test.py @@ -6,7 +6,9 @@ class TestSuite(unittest.TestCase): def test(self): app = App() app.calculate() - self.failIf(app.retrieve() != 62) + self.failIf(app.retrieve1() != 62) + self.failIf(app.retrieve1() != 66) + self.failIf(app.retrieve1() != 70) def main(): unittest.main() From 800ef742b83672a7f9190f13cb929cfc7fa18b64 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:13:15 +0530 Subject: [PATCH 46/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 93f14553..406694f2 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,7 +22,7 @@ before_script: script: - which python - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - - coverage run `which nosetests` test2.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml + # - coverage run `which nosetests` test2.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - coverage xml -o shippable/codecoverage/coverage.xml integrations: From b0b9e487513cc4da0fd565705877e96f9d3c5522 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:14:34 +0530 Subject: [PATCH 47/82] Update test.py --- test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test.py b/test.py index f65a5fb7..eac7aced 100755 --- a/test.py +++ b/test.py @@ -7,8 +7,8 @@ def test(self): app = App() app.calculate() self.failIf(app.retrieve1() != 62) - self.failIf(app.retrieve1() != 66) - self.failIf(app.retrieve1() != 70) + self.failIf(app.retrieve2() != 66) + self.failIf(app.retrieve3() != 70) def main(): unittest.main() From 5e0066152c4a254aa764c82d3eac14a314f4b6f9 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:17:34 +0530 Subject: [PATCH 48/82] Update app.py --- app.py | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/app.py b/app.py index 684a53c4..aaebb0bb 100644 --- a/app.py +++ b/app.py @@ -3,32 +3,38 @@ def __init__(self): self.var1 = 15 def calculate(self): - self.result1 = self.var1 * 4 + 2 + self.result = self.var1 * 4 + 2 - def retrieve1(self): - return self.result1 - + def retrieve(self): + return self.result + +class App2(): def __init__(self): self.var2 = 16 def calculate(self): - self.result2 = self.var2 * 4 + 2 - - def retrieve2(self): - return self.result2 + self.result = self.var2 * 4 + 2 + def retrieve(self): + return self.result + +class App3(): def __init__(self): self.var3 = 17 def calculate(self): - self.result3 = self.var3 * 4 + 2 + self.result = self.var3 * 4 + 2 - def retrieve1(self): - return self.result3 + def retrieve(self): + return self.result if __name__ == "__main__": app = App() app.calculate() - print(app.retrieve1) - print(app.retrieve2) - print(app.retrieve3) + print(app.retrieve) + app2 = App2() + app.calculate() + print(app.retrieve) + app3 = App3() + app.calculate() + print(app.retrieve) From 8c2927e559c0e0c2ff1c1fc15d8f4300a6b9596e Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:18:29 +0530 Subject: [PATCH 49/82] Update test.py --- test.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test.py b/test.py index eac7aced..4686549a 100755 --- a/test.py +++ b/test.py @@ -6,9 +6,13 @@ class TestSuite(unittest.TestCase): def test(self): app = App() app.calculate() - self.failIf(app.retrieve1() != 62) - self.failIf(app.retrieve2() != 66) - self.failIf(app.retrieve3() != 70) + self.failIf(app.retrieve() != 62) + app2 = App2() + app2.calculate() + self.failIf(app2.retrieve() != 66) + app3 = App3() + app3.calculate() + self.failIf(app3.retrieve() != 70) def main(): unittest.main() From e17324bbf904b1a965cb61f72c96d760fb10f2da Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:21:38 +0530 Subject: [PATCH 50/82] Update test.py --- test.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test.py b/test.py index 4686549a..4957badf 100755 --- a/test.py +++ b/test.py @@ -1,15 +1,23 @@ import unittest from app import App -class TestSuite(unittest.TestCase): +class TestSuite1(unittest.TestCase1): def test(self): app = App() app.calculate() self.failIf(app.retrieve() != 62) + +from app import App2 + +class TestSuite2(unittest.TestCase2): app2 = App2() app2.calculate() self.failIf(app2.retrieve() != 66) + +from app import App3 + +class TestSuite3(unittest.TestCase3): app3 = App3() app3.calculate() self.failIf(app3.retrieve() != 70) From 21182a67f32699328c7fc3e487540ba576a5d893 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:23:28 +0530 Subject: [PATCH 51/82] Update test.py --- test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test.py b/test.py index 4957badf..d12a1edd 100755 --- a/test.py +++ b/test.py @@ -8,14 +8,14 @@ def test(self): app.calculate() self.failIf(app.retrieve() != 62) -from app import App2 +from app2 import App2 class TestSuite2(unittest.TestCase2): app2 = App2() app2.calculate() self.failIf(app2.retrieve() != 66) -from app import App3 +from app3 import App3 class TestSuite3(unittest.TestCase3): app3 = App3() From e028edb8103c76f13adbf7d91c9981d2e70d1584 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:24:42 +0530 Subject: [PATCH 52/82] Update test.py --- test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test.py b/test.py index d12a1edd..c25e0c7e 100755 --- a/test.py +++ b/test.py @@ -1,7 +1,7 @@ import unittest from app import App -class TestSuite1(unittest.TestCase1): +class TestSuite1(unittest.TestCase): def test(self): app = App() @@ -10,14 +10,14 @@ def test(self): from app2 import App2 -class TestSuite2(unittest.TestCase2): +class TestSuite2(unittest.TestCase): app2 = App2() app2.calculate() self.failIf(app2.retrieve() != 66) from app3 import App3 -class TestSuite3(unittest.TestCase3): +class TestSuite3(unittest.TestCase): app3 = App3() app3.calculate() self.failIf(app3.retrieve() != 70) From 134ab80e54b4d16c8cc22ee196514005631ec8b4 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:31:39 +0530 Subject: [PATCH 53/82] Update app.py --- app.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index aaebb0bb..a8732072 100644 --- a/app.py +++ b/app.py @@ -9,14 +9,14 @@ def retrieve(self): return self.result class App2(): - def __init__(self): + def __init__(self2): self.var2 = 16 def calculate(self): - self.result = self.var2 * 4 + 2 + self2.result = self2.var2 * 4 + 2 - def retrieve(self): - return self.result + def retrieve(self2): + return self2.result class App3(): def __init__(self): From 54606543701609284655c057871445417c7c083e Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:31:53 +0530 Subject: [PATCH 54/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index c25e0c7e..c4b69d65 100755 --- a/test.py +++ b/test.py @@ -13,7 +13,7 @@ def test(self): class TestSuite2(unittest.TestCase): app2 = App2() app2.calculate() - self.failIf(app2.retrieve() != 66) + self2.failIf(app2.retrieve() != 66) from app3 import App3 From 152c298351d25c9d9d8ba301d7392e63363e8a47 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:34:15 +0530 Subject: [PATCH 55/82] Update app.py --- app.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index a8732072..adf40e4e 100644 --- a/app.py +++ b/app.py @@ -9,14 +9,14 @@ def retrieve(self): return self.result class App2(): - def __init__(self2): + def __init__(self): self.var2 = 16 def calculate(self): - self2.result = self2.var2 * 4 + 2 + self.result = self.var2 * 4 + 2 - def retrieve(self2): - return self2.result + def retrieve(self): + return self.result class App3(): def __init__(self): @@ -33,8 +33,8 @@ def retrieve(self): app.calculate() print(app.retrieve) app2 = App2() - app.calculate() - print(app.retrieve) + app2.calculate() + print(app2.retrieve) app3 = App3() - app.calculate() - print(app.retrieve) + app3.calculate() + print(app3.retrieve) From 99ddc7c5379839c38586ad150a085bf3cd9e9cb4 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:35:17 +0530 Subject: [PATCH 56/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index c4b69d65..c25e0c7e 100755 --- a/test.py +++ b/test.py @@ -13,7 +13,7 @@ def test(self): class TestSuite2(unittest.TestCase): app2 = App2() app2.calculate() - self2.failIf(app2.retrieve() != 66) + self.failIf(app2.retrieve() != 66) from app3 import App3 From 5536c9d470759907ef5d52ba63e47c2411e7e456 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:36:45 +0530 Subject: [PATCH 57/82] Update test.py --- test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test.py b/test.py index c25e0c7e..cda9da75 100755 --- a/test.py +++ b/test.py @@ -11,6 +11,7 @@ def test(self): from app2 import App2 class TestSuite2(unittest.TestCase): + def test(self): app2 = App2() app2.calculate() self.failIf(app2.retrieve() != 66) @@ -18,6 +19,7 @@ class TestSuite2(unittest.TestCase): from app3 import App3 class TestSuite3(unittest.TestCase): + def test(self): app3 = App3() app3.calculate() self.failIf(app3.retrieve() != 70) From 217ecdb9a054563c3e9c352d031842938cfafdbf Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:39:19 +0530 Subject: [PATCH 58/82] Update test.py --- test.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test.py b/test.py index cda9da75..01cfa55e 100755 --- a/test.py +++ b/test.py @@ -16,13 +16,13 @@ def test(self): app2.calculate() self.failIf(app2.retrieve() != 66) -from app3 import App3 +#from app3 import App3 -class TestSuite3(unittest.TestCase): - def test(self): - app3 = App3() - app3.calculate() - self.failIf(app3.retrieve() != 70) +#class TestSuite3(unittest.TestCase): + # def test(self): + # app3 = App3() + # app3.calculate() + # self.failIf(app3.retrieve() != 70) def main(): unittest.main() From add80b651dd14e2d66d3d4e4315e547e7e6d0e65 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:39:58 +0530 Subject: [PATCH 59/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 01cfa55e..d498211c 100755 --- a/test.py +++ b/test.py @@ -14,7 +14,7 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() - self.failIf(app2.retrieve() != 66) + self.failIf(app2.retrieve() != 62) #from app3 import App3 From a25328d6ce83cf16b022edc24e873cd263bb8a9c Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:41:05 +0530 Subject: [PATCH 60/82] Update app.py --- app.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index adf40e4e..04639e06 100644 --- a/app.py +++ b/app.py @@ -10,20 +10,20 @@ def retrieve(self): class App2(): def __init__(self): - self.var2 = 16 + self.var2 = 15 def calculate(self): - self.result = self.var2 * 4 + 2 + self.result = self.var2 * 4 + 3 def retrieve(self): return self.result class App3(): def __init__(self): - self.var3 = 17 + self.var3 = 15 def calculate(self): - self.result = self.var3 * 4 + 2 + self.result = self.var3 * 4 + 4 def retrieve(self): return self.result From 1938e2e5e5ebb1150885356286ac1fd78a86a224 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:41:19 +0530 Subject: [PATCH 61/82] Update test.py --- test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test.py b/test.py index d498211c..532cecfe 100755 --- a/test.py +++ b/test.py @@ -14,7 +14,7 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() - self.failIf(app2.retrieve() != 62) + self.failIf(app2.retrieve() != 63) #from app3 import App3 @@ -22,7 +22,7 @@ def test(self): # def test(self): # app3 = App3() # app3.calculate() - # self.failIf(app3.retrieve() != 70) + # self.failIf(app3.retrieve() != 64) def main(): unittest.main() From 1399affa2c34c24cbc38d5ec4ea592df675d1e51 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:42:58 +0530 Subject: [PATCH 62/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 532cecfe..edca9445 100755 --- a/test.py +++ b/test.py @@ -14,7 +14,7 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() - self.failIf(app2.retrieve() != 63) + self.failIf(app2.retrieve() != 105) #from app3 import App3 From aca09d7d2dcfafdfee6db2034b4fa57bc00f3150 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:44:18 +0530 Subject: [PATCH 63/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index edca9445..b3c08b56 100755 --- a/test.py +++ b/test.py @@ -14,7 +14,7 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() - self.failIf(app2.retrieve() != 105) + self.failIf(app2.retrieve() != 62) #from app3 import App3 From 5ab2d86eef8cedbaf22d56448446c84ae6dc1a37 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:46:43 +0530 Subject: [PATCH 64/82] Update test.py --- test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test.py b/test.py index b3c08b56..4606af16 100755 --- a/test.py +++ b/test.py @@ -14,8 +14,10 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() + print(app2.retrieve) self.failIf(app2.retrieve() != 62) + #from app3 import App3 #class TestSuite3(unittest.TestCase): From bd1c2314dbf5dec1127b6aeb9b5e97c729bec1cb Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:48:04 +0530 Subject: [PATCH 65/82] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 406694f2..e381a29a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,8 +21,10 @@ before_script: script: - which python + - print(app2.retrieve) - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml # - coverage run `which nosetests` test2.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml + - coverage xml -o shippable/codecoverage/coverage.xml integrations: From c5f7de89d4b82be67e47cf78fe870405a40cfab3 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:53:33 +0530 Subject: [PATCH 66/82] Update shippable.yml --- shippable.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index e381a29a..3f64f076 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,10 +21,7 @@ before_script: script: - which python - - print(app2.retrieve) - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - # - coverage run `which nosetests` test2.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - - coverage xml -o shippable/codecoverage/coverage.xml integrations: From 647407869fbb691f7fd1ebdd44bd3854f45a83bf Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 13:56:01 +0530 Subject: [PATCH 67/82] Update test.py --- test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test.py b/test.py index 4606af16..e94d5035 100755 --- a/test.py +++ b/test.py @@ -14,8 +14,7 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() - print(app2.retrieve) - self.failIf(app2.retrieve() != 62) + self.failIf(app2.retrieve() != 63) #from app3 import App3 From 60aae37e4e4fd3314863771d9891bcc477dadc9f Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 14:18:00 +0530 Subject: [PATCH 68/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index e94d5035..849b262b 100755 --- a/test.py +++ b/test.py @@ -14,7 +14,7 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() - self.failIf(app2.retrieve() != 63) + self.failIf(app2.retrieve() != 64) #from app3 import App3 From af1b32771e236d2510710a765abb24981b8295b9 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 14:19:56 +0530 Subject: [PATCH 69/82] Update test.py --- test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.py b/test.py index 849b262b..2a1cfbac 100755 --- a/test.py +++ b/test.py @@ -7,7 +7,8 @@ def test(self): app = App() app.calculate() self.failIf(app.retrieve() != 62) - + +import unittest2 from app2 import App2 class TestSuite2(unittest.TestCase): @@ -27,6 +28,7 @@ def test(self): def main(): unittest.main() + unittest2.main() if __name__ == "__main__": main() From 2f8ce10c66ddde33f31a6908cc92c899b5f2d72c Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 14:21:27 +0530 Subject: [PATCH 70/82] Update test.py --- test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test.py b/test.py index 2a1cfbac..b944fb95 100755 --- a/test.py +++ b/test.py @@ -8,10 +8,10 @@ def test(self): app.calculate() self.failIf(app.retrieve() != 62) -import unittest2 from app2 import App2 class TestSuite2(unittest.TestCase): + def test(self): app2 = App2() app2.calculate() @@ -28,7 +28,6 @@ def test(self): def main(): unittest.main() - unittest2.main() if __name__ == "__main__": main() From 3289203e87d691b197fe68a16857a101c72f235b Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 14:23:40 +0530 Subject: [PATCH 71/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index b944fb95..23021a07 100755 --- a/test.py +++ b/test.py @@ -8,7 +8,7 @@ def test(self): app.calculate() self.failIf(app.retrieve() != 62) -from app2 import App2 +from app import App2 class TestSuite2(unittest.TestCase): From d8db568c56c3930fca932fe407595bb36294f76e Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 14:25:11 +0530 Subject: [PATCH 72/82] Update app.py --- app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.py b/app.py index 04639e06..93939d97 100644 --- a/app.py +++ b/app.py @@ -13,7 +13,7 @@ def __init__(self): self.var2 = 15 def calculate(self): - self.result = self.var2 * 4 + 3 + self.result = self.var2 * 4 def retrieve(self): return self.result From eb8186cf51c6b185ac2892e0b44f30aea7d396e1 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 14:25:27 +0530 Subject: [PATCH 73/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 23021a07..c1292537 100755 --- a/test.py +++ b/test.py @@ -15,7 +15,7 @@ class TestSuite2(unittest.TestCase): def test(self): app2 = App2() app2.calculate() - self.failIf(app2.retrieve() != 64) + self.failIf(app2.retrieve() != 60) #from app3 import App3 From 183979bbdf19b10c5b7679860aeb7afd6bf58579 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:01:37 +0530 Subject: [PATCH 74/82] Update app.py --- app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.py b/app.py index 93939d97..e90893ac 100644 --- a/app.py +++ b/app.py @@ -23,7 +23,7 @@ def __init__(self): self.var3 = 15 def calculate(self): - self.result = self.var3 * 4 + 4 + self.result = self.var3 * 5 def retrieve(self): return self.result From b494af57d5b868d5bdc53a940521025084617781 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:02:04 +0530 Subject: [PATCH 75/82] Update test.py --- test.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test.py b/test.py index c1292537..2f4bdd03 100755 --- a/test.py +++ b/test.py @@ -16,15 +16,14 @@ def test(self): app2 = App2() app2.calculate() self.failIf(app2.retrieve() != 60) - - -#from app3 import App3 + +from app3 import App3 -#class TestSuite3(unittest.TestCase): - # def test(self): - # app3 = App3() - # app3.calculate() - # self.failIf(app3.retrieve() != 64) +class TestSuite3(unittest.TestCase): + def test(self): + app3 = App3() + app3.calculate() + self.failIf(app3.retrieve() != 75) def main(): unittest.main() From 04b99a544e321a553f1da541ca534270ff16bb45 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:10:49 +0530 Subject: [PATCH 76/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 2f4bdd03..6c13eb96 100755 --- a/test.py +++ b/test.py @@ -17,7 +17,7 @@ def test(self): app2.calculate() self.failIf(app2.retrieve() != 60) -from app3 import App3 +from app import App3 class TestSuite3(unittest.TestCase): def test(self): From 46864359c342ceabc4b7dc863279f821bee0a92b Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:14:16 +0530 Subject: [PATCH 77/82] Update test.py --- test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.py b/test.py index 6c13eb96..e42a0123 100755 --- a/test.py +++ b/test.py @@ -23,7 +23,9 @@ class TestSuite3(unittest.TestCase): def test(self): app3 = App3() app3.calculate() - self.failIf(app3.retrieve() != 75) + self.failIf(app3.retrieve() != 76) + +from app2 import App3 def main(): unittest.main() From 7790d68348c94760dfa60060c7564f85647aae06 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:15:19 +0530 Subject: [PATCH 78/82] Update test.py --- test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test.py b/test.py index e42a0123..be1cf57d 100755 --- a/test.py +++ b/test.py @@ -24,8 +24,6 @@ def test(self): app3 = App3() app3.calculate() self.failIf(app3.retrieve() != 76) - -from app2 import App3 def main(): unittest.main() From 41e0521058d28a4ba74a3f34e380375ccfdb0308 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:25:33 +0530 Subject: [PATCH 79/82] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 3f64f076..14e7fc43 100755 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,7 @@ python: # - 3.3 # - 3.4 - 3.5 - # - pypy + - pypy #- pypy3 install: From 9ba9982a49e77d0fbe2693e4ac8dc5dfb3b505a3 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:26:08 +0530 Subject: [PATCH 80/82] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 14e7fc43..7dd84051 100755 --- a/shippable.yml +++ b/shippable.yml @@ -8,6 +8,7 @@ python: # - 3.3 # - 3.4 - 3.5 + - 3.6 - pypy #- pypy3 From 0325470404d40fbf802f57205f92ebd62ccf8639 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 11 Sep 2017 15:26:22 +0530 Subject: [PATCH 81/82] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index be1cf57d..6c13eb96 100755 --- a/test.py +++ b/test.py @@ -23,7 +23,7 @@ class TestSuite3(unittest.TestCase): def test(self): app3 = App3() app3.calculate() - self.failIf(app3.retrieve() != 76) + self.failIf(app3.retrieve() != 75) def main(): unittest.main() From a2bc9f1a043a1a90b99b354a4b975f1b3725fa2b Mon Sep 17 00:00:00 2001 From: hometest1 Date: Fri, 22 Sep 2017 15:11:04 +0530 Subject: [PATCH 82/82] Update shippable.yml --- shippable.yml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/shippable.yml b/shippable.yml index 7dd84051..586316de 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,48 +25,3 @@ script: - coverage run `which nosetests` test.py --with-xunit --xunit-file=shippable/testresults/nosetests.xml - coverage xml -o shippable/codecoverage/coverage.xml -integrations: - notifications: - - integrationName: notify-slack - type: slack - recipients: - - "#random" - - "#rc-public" - - "#rc-private" - on_start: always - on_success: change - on_failure: change - on_cancel: change - - - integrationName: email - type: email - recipients: - - shiptest.rc.ow@gmail.com - - shiptest.rc.me@gmail.com - # sendConsoleLogs : true - # sendCoverageReports : true - on_start: always - on_success: change - on_failure: change - on_cancel: change - - - integrationName: irc - type: irc - recipients: - - "chat.freenode.net#test-rc" - - "webchat.irchighway.net#test-rc" - on_start: always - on_success: change - on_failure: change - on_cancel: change - - - integrationName: notify-hipchat - type: hipchat - recipients: - - '#rc-private' - - '#rc-public' - - '@shiptestrcow' - on_start: always - on_success: change - on_failure: change - on_cancel: change