Edl 500 error bug (demisto#12797)

MosheEichler · roysagi · web-flow · commit d0b1300044c7 · 2021-05-24T11:23:04.000+03:00
* changed from string to int

* RN

* RN

* RN

* revert unnecessary changes

* Update 1_11_1.md

* change the unit test

* CR

Co-authored-by: roysagi &lt;50295826+roysagi@users.noreply.github.com&gt;
diff --git a/Packs/Base/ReleaseNotes/1_11_1.md b/Packs/Base/ReleaseNotes/1_11_1.md
@@ -0,0 +1,4 @@
+
+#### Scripts
+##### CommonServerPython
+- Fixed an issue where the **is_demisto_version_ge** method returned an incorrect response.
diff --git a/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py b/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py
@@ -6270,7 +6270,7 @@ def is_demisto_version_ge(version, build_number=''):
         server_version = get_demisto_version()
         return \
             server_version.get('version') >= version and \
-            (not build_number or server_version.get('buildNumber') >= build_number)
+            (not build_number or int(server_version.get('buildNumber')) >= int(build_number))
     except AttributeError:
         # demistoVersion was added in 5.0.0. We are currently running in 4.5.0 and below
         if version >= "5.0.0":
diff --git a/Packs/Base/Scripts/CommonServerPython/CommonServerPython_test.py b/Packs/Base/Scripts/CommonServerPython/CommonServerPython_test.py
@@ -1198,6 +1198,7 @@ def test_is_demisto_version_build_ge(mocker):
     )
     assert is_demisto_version_ge('6.0.0', '49999')
     assert is_demisto_version_ge('6.0.0', '50000')
+    assert is_demisto_version_ge('6.0.0', '6')  # Added with the fix of https://github.com/demisto/etc/issues/36876
     assert not is_demisto_version_ge('6.0.0', '50001')
     assert not is_demisto_version_ge('6.1.0', '49999')
     assert not is_demisto_version_ge('5.5.0', '50001')
diff --git a/Packs/Base/pack_metadata.json b/Packs/Base/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Base",
     "description": "The base pack for Cortex XSOAR.",
     "support": "xsoar",
-    "currentVersion": "1.11.0",
+    "currentVersion": "1.11.1",
     "author": "Cortex XSOAR",
     "serverMinVersion": "6.0.0",
     "url": "https://www.paloaltonetworks.com/cortex",

Original file line number	Diff line number	Diff line change
`@@ -1198,6 +1198,7 @@ def test_is_demisto_version_build_ge(mocker):`
`1198`	`1198`	`)`
`1199`	`1199`	`assert is_demisto_version_ge('6.0.0', '49999')`
`1200`	`1200`	`assert is_demisto_version_ge('6.0.0', '50000')`
	`1201`	`+ assert is_demisto_version_ge('6.0.0', '6') # Added with the fix of https://github.com/demisto/etc/issues/36876`
`1201`	`1202`	`assert not is_demisto_version_ge('6.0.0', '50001')`
`1202`	`1203`	`assert not is_demisto_version_ge('6.1.0', '49999')`
`1203`	`1204`	`assert not is_demisto_version_ge('5.5.0', '50001')`