Update query_with_count return value so the second tuple item (count) is

always an integer.

Update affected code.

Author: Kami

st2client/st2client/commands/action.py

@@ -1083,7 +1083,7 @@ def run_and_print(self, args, **kwargs):
                               attributes=args.attr, widths=args.width,
                               attribute_transform_functions=self.attribute_transform_functions)
 
-            if args.last and count and int(count) > args.last:
+            if args.last and count and count > args.last:
                 table.SingleRowTable.note_box(self.resource_name, args.last)
 
 

st2client/st2client/commands/rule.py

@@ -95,7 +95,7 @@ def run_and_print(self, args, **kwargs):
             self.print_output(instances, table.MultiColumnTable,
                               attributes=args.attr, widths=args.width)
 
-            if args.last and count and int(count) > args.last:
+            if args.last and count and count > args.last:
                 table.SingleRowTable.note_box(self.resource_name, args.last)
 
 

st2client/st2client/commands/rule_enforcement.py

@@ -122,5 +122,5 @@ def run_and_print(self, args, **kwargs):
         else:
             self.print_output(instances, table.MultiColumnTable,
                               attributes=args.attr, widths=args.width)
-            if args.last and count and int(count) > args.last:
+            if args.last and count and count > args.last:
                 table.SingleRowTable.note_box(self.resource_name, args.last)

st2client/st2client/commands/trace.py

@@ -176,7 +176,7 @@ def run_and_print(self, args, **kwargs):
             self.print_trace_details(trace=instances[0], args=args)
 
             if not args.json and not args.yaml:
-                if args.last and count and int(count) > args.last:
+                if args.last and count and count > args.last:
                         table.SingleRowTable.note_box(self.resource_name, 1)
         else:
             if args.json or args.yaml:
@@ -189,7 +189,7 @@ def run_and_print(self, args, **kwargs):
                                   attributes=args.attr, widths=args.width,
                                   attribute_transform_functions=self.attribute_transform_functions)
 
-                if args.last and count and int(count) > args.last:
+                if args.last and count and count > args.last:
                     table.SingleRowTable.note_box(self.resource_name, args.last)
 
 

st2client/st2client/commands/triggerinstance.py

@@ -121,7 +121,6 @@ def run(self, args, **kwargs):
         return self.manager.query_with_count(limit=args.last, **kwargs)
 
     def run_and_print(self, args, **kwargs):
-
         instances, count = self.run(args, **kwargs)
         if args.json or args.yaml:
             self.print_output(reversed(instances), table.MultiColumnTable,
@@ -132,7 +131,7 @@ def run_and_print(self, args, **kwargs):
             self.print_output(reversed(instances), table.MultiColumnTable,
                               attributes=args.attr, widths=args.width,
                               attribute_transform_functions=self.attribute_transform_functions)
-            if args.last and count and int(count) > args.last:
+            if args.last and count and count > args.last:
                 table.SingleRowTable.note_box(self.resource_name, args.last)
 
 

st2client/st2client/models/core.py

@@ -285,7 +285,7 @@ def query(self, **kwargs):
     def query_with_count(self, **kwargs):
         instances, response = self._query_details(**kwargs)
         if response and 'X-Total-Count' in response.headers:
-            return (instances, response.headers['X-Total-Count'])
+            return (instances, int(response.headers['X-Total-Count']))
         else:
             return (instances, None)
 

st2client/tests/unit/test_models.py

@@ -114,7 +114,7 @@ def test_resource_query_with_count(self):
         actual = [resource.serialize() for resource in resources]
         expected = json.loads(json.dumps([base.RESOURCES[0]]))
         self.assertEqual(actual, expected)
-        self.assertEqual(count, '50')
+        self.assertEqual(count, 50)
 
     @mock.patch.object(
         httpclient.HTTPClient, 'get',