Return single observable correctly. Fix #309

STIXProject · Oct 27, 2016 · f7f90a8 · f7f90a8
1 parent 5b0f411
commit f7f90a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/stix/indicator/indicator.py b/stix/indicator/indicator.py
@@ -248,7 +248,8 @@ def observables(self):
         elif self.observable.observable_composition:
             return self.observable.observable_composition.observables
 
-        return []
+        # self.observable is defined and not a composition.
+        return [self.observable]
 
     @observables.setter
     def observables(self, value):

diff --git a/stix/test/indicator_test.py b/stix/test/indicator_test.py
@@ -490,7 +490,8 @@ def test_observables_property_standard(self):
 
         ind2 = Indicator.from_dict(ind.to_dict())
 
-        self.assertEqual([obs], ind2.observables)
+        self.assertEqual([obs.to_dict()],
+                         [x.to_dict() for x in ind2.observables])
 
 
 class RelatedCampaignReferencesTests(unittest.TestCase, EntityTestCase):