From c7fb79d195404ed287934b38e6a9e52e359d08b5 Mon Sep 17 00:00:00 2001
From: Chris Lenk <clenk@mitre.org>
Date: Fri, 3 Apr 2020 15:58:56 -0400
Subject: [PATCH] Fix some TAXII DataStore tests

---
 stix2/test/v20/test_datastore_taxii.py |  9 ++++++---
 stix2/test/v21/test_datastore_taxii.py | 10 +++++++---
 tox.ini                                |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/stix2/test/v20/test_datastore_taxii.py b/stix2/test/v20/test_datastore_taxii.py
index 5a3c0cb..bf73ab4 100644
--- a/stix2/test/v20/test_datastore_taxii.py
+++ b/stix2/test/v20/test_datastore_taxii.py
@@ -4,7 +4,8 @@ from medallion.filters.basic_filter import BasicFilter
 import pytest
 from requests.models import Response
 import six
-from taxii2client import Collection, _filter_kwargs_to_query_params
+from taxii2client import Collection
+from taxii2client.common import _filter_kwargs_to_query_params
 
 import stix2
 from stix2.datastore import DataSourceError
@@ -38,7 +39,8 @@ class MockTAXIICollectionEndpoint(Collection):
             self.objects,
             ("id", "type", "version"),
             [],
-        )
+            None,
+        )[0]
         if objs:
             return stix2.v20.Bundle(objects=objs)
         else:
@@ -59,7 +61,8 @@ class MockTAXIICollectionEndpoint(Collection):
                 objects,
                 ("version",),
                 [],
-            )
+                None,
+            )[0]
         else:
             filtered_objects = []
         if filtered_objects:
diff --git a/stix2/test/v21/test_datastore_taxii.py b/stix2/test/v21/test_datastore_taxii.py
index 528546a..35dc0ba 100644
--- a/stix2/test/v21/test_datastore_taxii.py
+++ b/stix2/test/v21/test_datastore_taxii.py
@@ -4,7 +4,8 @@ from medallion.filters.basic_filter import BasicFilter
 import pytest
 from requests.models import Response
 import six
-from taxii2client import Collection, _filter_kwargs_to_query_params
+from taxii2client import Collection
+from taxii2client.common import _filter_kwargs_to_query_params
 
 import stix2
 from stix2.datastore import DataSourceError
@@ -38,8 +39,10 @@ class MockTAXIICollectionEndpoint(Collection):
             self.objects,
             ("id", "type", "version"),
             [],
-        )
+            None,
+        )[0]
         if objs:
+            print(objs)
             return stix2.v21.Bundle(objects=objs)
         else:
             resp = Response()
@@ -59,7 +62,8 @@ class MockTAXIICollectionEndpoint(Collection):
                 objects,
                 ("version",),
                 [],
-            )
+                None,
+            )[0]
         else:
             filtered_objects = []
         if filtered_objects:
diff --git a/tox.ini b/tox.ini
index aa0472a..d34aac1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,11 +8,11 @@ deps =
   pytest
   pytest-cov
   coverage
-  taxii2-client<1.0.0
+  taxii2-client
   fuzzywuzzy
   haversine
   python-Levenshtein
-  medallion<2.0.0
+  medallion
 commands =
   python -m pytest --cov=stix2 stix2/test/ --cov-report term-missing -W ignore::stix2.exceptions.STIXDeprecationWarning