From 0b8bda33fb4c305e59e1320faa606194241b4be5 Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 17:38:34 -0400 Subject: [PATCH 01/13] Add debugging to help understand why travis is now failing --- test/integration/test/slice.clj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/test/slice.clj b/test/integration/test/slice.clj index 99fd022..d9b0770 100644 --- a/test/integration/test/slice.clj +++ b/test/integration/test/slice.clj @@ -9,6 +9,7 @@ (deftest ^:integration test-query-slice-with-no-params (testing "it returns successfully as text/html" (let [resp (GET "/data/integration_test/slice/incomes")] + (print "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/html;charset=UTF-8" "Vary" "Accept"})))) From 0f8d66d1797514243432d49834acc9a2917541ad Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 17:44:57 -0400 Subject: [PATCH 02/13] more test debugging --- test/integration/test/slice.clj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/test/slice.clj b/test/integration/test/slice.clj index d9b0770..f1b30be 100644 --- a/test/integration/test/slice.clj +++ b/test/integration/test/slice.clj @@ -27,6 +27,7 @@ (deftest ^:integration test-json (testing "it returns a content-type of application/json" (let [resp (GET "/data/integration_test/slice/incomes.json")] + (print "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "application/json;charset=UTF-8"})))) @@ -34,6 +35,7 @@ (deftest ^:integration test-jsonp (testing "it uses the callback we supply" (let [resp (GET "/data/integration_test/slice/incomes.jsonp?$callback=foo")] + (print "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/javascript;charset=UTF-8"}) @@ -41,6 +43,7 @@ (testing "it uses 'callback' by default" (let [resp (GET "/data/integration_test/slice/incomes.jsonp")] + (print "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/javascript;charset=UTF-8"}) From b609e332b059bce0379f5a399e862a622fc028af Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 17:50:44 -0400 Subject: [PATCH 03/13] even more debug --- test/integration/test/slice.clj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/test/slice.clj b/test/integration/test/slice.clj index f1b30be..9664d3d 100644 --- a/test/integration/test/slice.clj +++ b/test/integration/test/slice.clj @@ -9,7 +9,7 @@ (deftest ^:integration test-query-slice-with-no-params (testing "it returns successfully as text/html" (let [resp (GET "/data/integration_test/slice/incomes")] - (print "RESPONSE" resp) + (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/html;charset=UTF-8" "Vary" "Accept"})))) @@ -27,7 +27,7 @@ (deftest ^:integration test-json (testing "it returns a content-type of application/json" (let [resp (GET "/data/integration_test/slice/incomes.json")] - (print "RESPONSE" resp) + (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "application/json;charset=UTF-8"})))) @@ -35,7 +35,7 @@ (deftest ^:integration test-jsonp (testing "it uses the callback we supply" (let [resp (GET "/data/integration_test/slice/incomes.jsonp?$callback=foo")] - (print "RESPONSE" resp) + (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/javascript;charset=UTF-8"}) @@ -43,7 +43,7 @@ (testing "it uses 'callback' by default" (let [resp (GET "/data/integration_test/slice/incomes.jsonp")] - (print "RESPONSE" resp) + (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/javascript;charset=UTF-8"}) @@ -52,6 +52,7 @@ (deftest ^:integration test-xml (testing "it returns a content-type of application/xml" (let [resp (GET "/data/integration_test/slice/incomes.xml")] + (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "application/xml;charset=UTF-8"})))) From 4a2c10dba33c350478d730e77eb400a970ee6f9b Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 17:53:06 -0400 Subject: [PATCH 04/13] migrate to new Travis container infrastructure (http://docs.travis-ci.com/user/migrating-from-legacy/) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 68fe1d1..adf7bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: clojure +sudo: false lein: lein2 script: lein2 inttest jdk: From cd36578bfbd77197b0d3dbfb987e5c920b569525 Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 18:05:55 -0400 Subject: [PATCH 05/13] update liberator; hail mary to get tests passing on travis --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 45004be..2e10307 100644 --- a/project.clj +++ b/project.clj @@ -39,7 +39,7 @@ [environ "0.5.0"] [halresource "0.1.1-20130809.164342-1"] [http-kit "2.1.18"] - [liberator "0.11.0"] + [liberator "0.13"] [lonocloud/synthread "1.0.5"] [me.raynes/fs "1.4.5"] [org.clojure/core.cache "0.6.3"] From 1e6b343c4d4105db42767fc24de73a99c14f4a4a Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 18:08:12 -0400 Subject: [PATCH 06/13] Revert "update liberator; hail mary to get tests passing on travis" This reverts commit cd36578bfbd77197b0d3dbfb987e5c920b569525. --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 2e10307..45004be 100644 --- a/project.clj +++ b/project.clj @@ -39,7 +39,7 @@ [environ "0.5.0"] [halresource "0.1.1-20130809.164342-1"] [http-kit "2.1.18"] - [liberator "0.13"] + [liberator "0.11.0"] [lonocloud/synthread "1.0.5"] [me.raynes/fs "1.4.5"] [org.clojure/core.cache "0.6.3"] From 01d6c9b61a4f07c2d2bfd56d8457036335831819 Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 18:09:07 -0400 Subject: [PATCH 07/13] update travis to test on jdk8 as well --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index adf7bc7..e058c7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: clojure sudo: false -lein: lein2 -script: lein2 inttest +lein: lein +script: lein inttest jdk: - oraclejdk7 + - oraclejdk8 - openjdk7 + - openjdk8 From e84d1e6743faca51e6e42b79206ede71e928c19f Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Thu, 30 Jul 2015 18:10:11 -0400 Subject: [PATCH 08/13] remove bad travis setting --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e058c7d..9304c76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,4 @@ jdk: - oraclejdk7 - oraclejdk8 - openjdk7 - - openjdk8 From a4585e11914509e3d63b8eff938bb24aa1a31208 Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Fri, 25 Sep 2015 08:13:48 -0400 Subject: [PATCH 09/13] Add additional classpath debugging to travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9304c76..ec67c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: clojure sudo: false lein: lein -script: lein inttest +script: lein do classpath, inttest jdk: - oraclejdk7 - oraclejdk8 From 7b7610d8bac421e1c142cfc4a2fff2c28de08f48 Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Fri, 25 Sep 2015 19:24:23 -0400 Subject: [PATCH 10/13] Update Vagrant to use latest JDK; increase timeout for installing bower since it's finicky --- doc/manifests/vagrant.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/manifests/vagrant.pp b/doc/manifests/vagrant.pp index 8cc26c5..05f48dd 100644 --- a/doc/manifests/vagrant.pp +++ b/doc/manifests/vagrant.pp @@ -53,7 +53,7 @@ ensure => present, } -package { "java-1.7.0-openjdk": +package { "java-1.8.0-openjdk": ensure => present, } @@ -73,6 +73,7 @@ command => "/usr/bin/npm install -g bower", creates => "/usr/bin/bower", require => Package["npm"], + timeout => 600, } exec { 'install grunt': From 994072e84c1f99a72d941551575a1d1cbc1088b9 Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Fri, 25 Sep 2015 19:25:35 -0400 Subject: [PATCH 11/13] remove debug from tests --- test/integration/test/slice.clj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/integration/test/slice.clj b/test/integration/test/slice.clj index 9664d3d..99fd022 100644 --- a/test/integration/test/slice.clj +++ b/test/integration/test/slice.clj @@ -9,7 +9,6 @@ (deftest ^:integration test-query-slice-with-no-params (testing "it returns successfully as text/html" (let [resp (GET "/data/integration_test/slice/incomes")] - (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/html;charset=UTF-8" "Vary" "Accept"})))) @@ -27,7 +26,6 @@ (deftest ^:integration test-json (testing "it returns a content-type of application/json" (let [resp (GET "/data/integration_test/slice/incomes.json")] - (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "application/json;charset=UTF-8"})))) @@ -35,7 +33,6 @@ (deftest ^:integration test-jsonp (testing "it uses the callback we supply" (let [resp (GET "/data/integration_test/slice/incomes.jsonp?$callback=foo")] - (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/javascript;charset=UTF-8"}) @@ -43,7 +40,6 @@ (testing "it uses 'callback' by default" (let [resp (GET "/data/integration_test/slice/incomes.jsonp")] - (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "text/javascript;charset=UTF-8"}) @@ -52,7 +48,6 @@ (deftest ^:integration test-xml (testing "it returns a content-type of application/xml" (let [resp (GET "/data/integration_test/slice/incomes.xml")] - (println "RESPONSE" resp) (does= (:status resp) 200) (does-contain (:headers resp) {"Content-Type" "application/xml;charset=UTF-8"})))) From 03721a04650315632f3b75f64c698e3102257f0a Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Fri, 25 Sep 2015 19:26:24 -0400 Subject: [PATCH 12/13] remove travis debug --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec67c3d..9304c76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: clojure sudo: false lein: lein -script: lein do classpath, inttest +script: lein inttest jdk: - oraclejdk7 - oraclejdk8 From 12d8956ce3ca8cc95fd402885afc0bc12938355f Mon Sep 17 00:00:00 2001 From: Marc Esher Date: Fri, 25 Sep 2015 19:33:32 -0400 Subject: [PATCH 13/13] undo my bower timeout --- doc/manifests/vagrant.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/manifests/vagrant.pp b/doc/manifests/vagrant.pp index 731dddb..a86e825 100644 --- a/doc/manifests/vagrant.pp +++ b/doc/manifests/vagrant.pp @@ -74,7 +74,6 @@ command => "/usr/bin/npm install -g bower", creates => "/usr/bin/bower", require => Package["npm"], - timeout => 600, } exec { 'install grunt':