From 3389560fe994c7c17d678c695128fe90824634d6 Mon Sep 17 00:00:00 2001
From: Hannah Ward <Hannah.ward9001@gmail.com>
Date: Sat, 19 Nov 2016 15:38:11 +0000
Subject: [PATCH] Removed unicode things

---
 tests/cve-in-exploit-target.xml               |  2 +-
 tests/malware-characterization-using-maec.xml |  2 +-
 tests/test.xml                                |  2 +-
 tests/test_upload.py                          | 21 +++++++++++++++++++
 tests/yara-test-mechanism.xml                 |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)

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 e69de29..8c3874d 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import subprocess
+import glob
+
+def test_push():
+    for fname in glob.glob("*.xml"):
+        proc = subprocess.Popen([
+                        "taxii-push", 
+                        "--path", "http://127.0.0.1:9000/services/inbox", 
+                        "-f", fname, 
+                        "--dest", "collection", 
+                        "--username", "travis", 
+                        "--password", "travis"
+                    ],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE
+                )
+
+        out,err = proc.communicate()
+        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>