[lib] Tests: Sync with new solver

library/test/test_solver_statements.py

@@ -6,9 +6,11 @@ from __future__ import print_function
 
 # Standard imports
 import pytest
+from packaging import version
 
 # Custom imports
 from pycryptosat import Solver
+from pycryptosat import __version__ as solver_version
 #from pyCryptoMS import CryptoMS
 
 
@@ -188,7 +190,10 @@ def test_statement1b(feed_statement1):
                 feed_statement1[2], feed_statement1[3], feed_statement1[4])
 
     # Check number of variables
-    found = solv.nb_vars()
+    if version.parse(solver_version) < version.parse("5.6.9"):
+        found = solv.nb_vars()
+    else:
+        found = solv.nb_vars
     assert feed_statement1[5] == found
 
     # Solve
@@ -210,7 +215,10 @@ def test_statement2b(feed_statement2):
                 feed_statement2[2], feed_statement2[3], feed_statement2[4])
 
     # Check number of variables
-    found = solv.nb_vars()
+    if version.parse(solver_version) < version.parse("5.6.9"):
+        found = solv.nb_vars()
+    else:
+        found = solv.nb_vars
     assert feed_statement2[5] == found
 
     # Solve
@@ -232,7 +240,10 @@ def test_statement3b(feed_statement3):
                 feed_statement3[2], feed_statement3[3], feed_statement3[4])
 
     # Check number of variables
-    found = solv.nb_vars()
+    if version.parse(solver_version) < version.parse("5.6.9"):
+        found = solv.nb_vars()
+    else:
+        found = solv.nb_vars
     assert feed_statement3[5] == found
 
     # Solve
@@ -254,7 +265,10 @@ def test_statement4b(feed_statement4):
                 feed_statement4[2], feed_statement4[3], feed_statement4[4])
 
     # Check number of variables
-    found = solv.nb_vars()
+    if version.parse(solver_version) < version.parse("5.6.9"):
+        found = solv.nb_vars()
+    else:
+        found = solv.nb_vars
     assert feed_statement4[5] == found
 
     # Solve