Issue/27/fix user agent test

.travis.yml

@@ -2,8 +2,8 @@ dist: trusty
 sudo: required
 language: clojure
 before_script:
-  - bash test/install_deps.sh
-  - bash test/start_mesos.sh
+  - sudo test/install_deps.sh
+  - sudo test/start_mesos.sh
 script:
   - make travis-check
 jdk:

Makefile

@@ -3,6 +3,6 @@ PROJECT=meson
 STANDALONE=target/$(PROJECT)-$(VERSION)-SNAPSHOT-standalone.jar
 ROOT_DIR = $(shell pwd)
 
-include resources/make/code.mk
-include resources/make/docs.mk
-include resources/make/test.mk
+include dev-resources/make/code.mk
+include dev-resources/make/docs.mk
+include dev-resources/make/test.mk

project.clj

@@ -1,6 +1,6 @@
 (defproject meson "0.1.0-SNAPSHOT"
   :description "Clojure Client Library for the Mesos HTTP API"
-  :url "https://github.com/oubiwann/meson"
+  :url "https://github.com/clojusc/meson"
   :license {:name "Apache License, Version 2.0"
             :url "http://www.apache.org/licenses/LICENSE-2.0"}
   :dependencies [[org.clojure/clojure "1.8.0"]

src/meson/client.clj

@@ -2,15 +2,12 @@
   (:require [clojusc.twig :as logger]
             [meson.const :as const]))
 
-(def user-agent (str "Meson REST Client/"
-                     const/client-version
-                     " (Clojure "
-                     const/clj-version
-                     "; Java "
-                     const/java-version
-                     ") (+"
-                     const/project-url
-                     ")"))
+(def user-agent
+  (format "Meson REST Client/%s (Clojure %s; Java %s) (+%s)"
+          const/client-version
+          const/clj-version
+          const/java-version
+          const/project-url))
 
 (def fields
   "Fields are maintained separately from the record so that they may be

test/install_deps.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 
-sudo apt-get install libevent-dev
+apt-get install libevent-dev
 
 MESOS_DEB=mesos_1.0.1-2.0.93.ubuntu1404_amd64.deb
 MESOS_DL=http://repos.mesosphere.com/ubuntu/pool/main/m/mesos/$MESOS_DEB
 curl --remote-name $MESOS_DL
-sudo dpkg -i $MESOS_DEB
+dpkg -i $MESOS_DEB
 rm $MESOS_DEB
-ls -al /etc/init.d/m*
-which mesos-master
-which mesos-agent
+echo "Mesos master binary: " `which mesos-master`
+echo "Mesos agent binary: " `which mesos-agent`

test/local-travis/Dockerfile

@@ -1,10 +1,44 @@
-FROM travisci/travis-jvm 
+FROM quay.io/travisci/travis-jvm
 MAINTAINER Clojure-Science / Clojure-Aided Enrichment Center <https://github.com/clojusc>
 
+ENV DEBIAN_FRONTEND noninteractive
+
+# Work around upstart in a docker image
+RUN dpkg-divert --local --rename --add /sbin/initctl
+RUN ln -s /bin/true /sbin/initctl
+
+# Work around this bug (won't be fixed in 14.04):
+# * https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1325142
+RUN dpkg-divert --local --add /etc/init.d/systemd-logind
+RUN ln -s /bin/true /etc/init.d/systemd-logind
+
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
+RUN apt-get update -y
+
+# Remove problematic software that prevents fully-automated upgrade
+RUN apt-get remove \
+  postgresql-9.1 postgresql-9.1-postgis-2.2-scripts postgresql-9.1-postgis-scripts postgresql-client-9.1 \ 
+  postgresql-9.2 postgresql-9.2-postgis-2.1 postgresql-9.2-postgis-2.2-scripts postgresql-9.2-postgis-2.3 postgresql-9.2-postgis-2.3-scripts postgresql-9.2-postgis-scripts postgresql-client-9.2 \
+  postgresql-9.3 postgresql-9.3-postgis-2.1 postgresql-9.3-postgis-2.3 postgresql-9.3-postgis-2.3-scripts postgresql-9.3-postgis-scripts postgresql-client-9.3
+RUN apt-get remove sudo policykit-1 colord
+RUN apt-get autoremove
+RUN apt-get install -y g++-4.6 libstdc++6-4.6-dev
+#RUN apt-get dist-upgrade -y
+#RUN apt-get install --only-upgrade -y libstdc++6 libc6 libgcc1
+
+# Mesos needs libs that aren in 14.04 but not in 12.04, so upgrade the release
+RUN apt-cache policy update-manager-core
+RUN apt-get install update-manager-core
+RUN do-release-upgrade -f DistUpgradeViewNonInteractive && \
+  echo "Successfully upgraded to 14.04." || \
+  echo "There were issues upgrading to 14.04." ; \
+  echo "Manual intervention may be needed."
+
+# Install Mesos
 RUN git clone https://github.com/clojusc/meson.git
 RUN cd meson && \
         bash test/install_deps.sh && \
         bash test/start_mesos.sh && \
-        cd ../ 
+        cd ../
 
 CMD ["make", "local-travis-check"]

test/meson/client_test.clj

@@ -3,10 +3,12 @@
             [meson.client :as client]))
 
 (deftest user-agent
-  (is (= client/user-agent
-         (str "Meson REST Client/0.1.0-SNAPSHOT "
-              "(Clojure 1.8.0; Java 1.8.0_45-internal) "
-              "(+https://github.com/oubiwann/meson)"))))
+  (is
+    (not
+      (nil?
+        (re-matches
+          #"Meson REST Client/.* \(Clojure .*; Java .*\) \(\+https://.*\)"
+          client/user-agent)))))
 
 (deftest ->base-client
   (let [c (client/->base-client)]
@@ -21,3 +23,4 @@
 (deftest get-url
   (let [c (client/->base-client {:master "myhost:8080"})]
     (is (= (client/get-url c) "http://myhost:8080/api/v1"))))
+

test/start_mesos.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-sudo nohup /usr/sbin/mesos-master --work_dir=/tmp/mesos-master --ip=127.0.0.1 > master.log &
-sudo nohup /usr/sbin/mesos-agent --work_dir=/tmp/mesos-agent --master=127.0.0.1:5050 > agent.log &
+nohup /usr/sbin/mesos-master --work_dir=/tmp/mesos-master --ip=127.0.0.1 > master.log &
+nohup /usr/sbin/mesos-agent --work_dir=/tmp/mesos-agent --master=127.0.0.1:5050 > agent.log &
 
 sleep 10