From 0c20984a54aec90c09d7df051899c90f05d551bc Mon Sep 17 00:00:00 2001
From: Hannah Ward <Hannah.ward9001@gmail.com>
Date: Sat, 19 Nov 2016 15:42:54 +0000
Subject: [PATCH] Squashed commit of the following:

commit 3389560fe994c7c17d678c695128fe90824634d6
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Sat Nov 19 15:38:11 2016 +0000

    Removed unicode things

commit 060f94f565caad28ea66b9a3826b84476dac8b92
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 16:10:28 2016 +0000

    Apparently output goes to stderr?

commit b41109dd9e2d8df943e40a46153bc8c4e5bd971b
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 16:01:39 2016 +0000

    127 not localhost?

commit 77c45273b0755c2c16e85936ca2b76b249cc95d9
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:54:12 2016 +0000

    Allow server time to start up

commit ee06ff076542d269468db5cc7cd2f9f157af16eb
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:48:38 2016 +0000

    sudo sudo

commit 9f0f31c0234a3c226e7d8ecdd7d9f95afcc77f60
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:47:45 2016 +0000

    Move sql install to before_install

commit 51b49dc1760643efe3a01756cfdca7fdb335be8e
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:46:02 2016 +0000

    Fixed a typo

commit 2b90620b4cb0d319dfebe8415d7a4fd0e75f2bf3
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:45:10 2016 +0000

    Mysql pls

commit 7f4e2b9f6213dd0a39ef38754c3aa6b19a2432aa
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:42:32 2016 +0000

    Switch to trusty travis

commit 64e39b798347740cd4700f6a2ac0dd9589a87ac1
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:35:31 2016 +0000

    Switch to trusty travis

commit 44685648608a04cba1b933479654159d4bf804ac
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:30:30 2016 +0000

    Stop being a tard

commit 0a9f534fa71bce3625c39f6cb28c294a57406806
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:28:04 2016 +0000

    Check mysql version

commit 887a6d82a7f8fc243f8d0740e97fbf85cb3c3c29
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:17:26 2016 +0000

    Print a bit of debug info
---
 .travis.yml                                   | 16 ++++++++++++----
 tests/cve-in-exploit-target.xml               |  2 +-
 tests/malware-characterization-using-maec.xml |  2 +-
 tests/test.xml                                |  2 +-
 tests/test_upload.py                          |  5 ++---
 tests/yara-test-mechanism.xml                 |  2 +-
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34153f1..4abef49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,31 @@
+dist: trusty
+sudo: required
+
 language: python
 
 python:
-    - "2.7"
     - "3.5"
     - "nightly"
 
-cache: pip
-
 services:
     - mysql
 
 env:
     - OPENTAXII_CONFIG=$TRAVIS_BUILD_DIR/config.yaml URL="http://ec2-52-42-201-6.us-west-2.compute.amazonaws.com" APIKEY=Vjy0ra7wO6w6si7hbjxX52nARfVpaAO6Tm6lxeSm
 
+before_install:
+    - sudo apt-get install mysql-server-5.6 mysql-client-core-5.6 mysql-client-5.6
+
 install:
+    # Check the config is ok
+    - echo $OPENTAXII_CONFIG
+    - mysql --version
     # Set up the deps
     - git submodule init 
     - git submodule update
     #Configure hooks
     - <misp_taxii_hooks/hooks.py sed 's@\[URL\]@'"$URL"'@; s@\[APIKEY\]@'"$APIKEY"'@' > misp_taxii_hooks/hooks.py
+    - head -n20 misp_taxii_hooks/hooks.py
     - python setup.py install
     # Install OpenTAXII
     - cd OpenTAXII
@@ -31,10 +38,11 @@ install:
     # Populate databases
     - opentaxii-create-services -c services.yaml
     - opentaxii-create-collections -c collections.yaml
-    - opentaxii-create-acccount -u travis -p travis
+    - opentaxii-create-account -u travis -p travis
 script:
     - opentaxii-run-dev &
     - pid=$!
+    - sleep 15
     - cd tests
     - nosetests .
     - cd .. 
diff --git a/tests/cve-in-exploit-target.xml b/tests/cve-in-exploit-target.xml
index 2d69cb0..9f8306a 100644
--- a/tests/cve-in-exploit-target.xml
+++ b/tests/cve-in-exploit-target.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <stix:STIX_Package
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:stix="http://stix.mitre.org/stix-1"
diff --git a/tests/malware-characterization-using-maec.xml b/tests/malware-characterization-using-maec.xml
index 53cb46d..44a306b 100644
--- a/tests/malware-characterization-using-maec.xml
+++ b/tests/malware-characterization-using-maec.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <stix:STIX_Package 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:stix="http://stix.mitre.org/stix-1"
diff --git a/tests/test.xml b/tests/test.xml
index e9ec659..1e45ddc 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <stix:STIX_Package
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:stix="http://stix.mitre.org/stix-1"
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 3e4f053..8c3874d 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -7,7 +7,7 @@ def test_push():
     for fname in glob.glob("*.xml"):
         proc = subprocess.Popen([
                         "taxii-push", 
-                        "--path", "http://localhost:9000/services/inbox", 
+                        "--path", "http://127.0.0.1:9000/services/inbox", 
                         "-f", fname, 
                         "--dest", "collection", 
                         "--username", "travis", 
@@ -18,5 +18,4 @@ def test_push():
                 )
 
         out,err = proc.communicate()
-        print(out)
-        assert("Content block successfully pushed" in out.decode("utf-8"))
+        assert("Content block successfully pushed" in err.decode("utf-8"))
diff --git a/tests/yara-test-mechanism.xml b/tests/yara-test-mechanism.xml
index 40f36af..6c01daa 100644
--- a/tests/yara-test-mechanism.xml
+++ b/tests/yara-test-mechanism.xml
@@ -54,4 +54,4 @@ rule silent_banker : banker
             </indicator:Test_Mechanisms>
         </stix:Indicator>
     </stix:Indicators>
-</stix:STIX_Package>
\ No newline at end of file
+</stix:STIX_Package>