From 0a73fc72c8e96d5aee010efe3f31c29cfd2ccb13 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 9 Jul 2012 12:22:33 +0200
Subject: [PATCH] move candidates unit test where it belongs

---
 sfa/client/candidates.py | 28 ++++++++++++++++++++++++++++
 sfa/client/sfaadmin.py   | 27 ---------------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/sfa/client/candidates.py b/sfa/client/candidates.py
index 77eef7d6..a49f4429 100644
--- a/sfa/client/candidates.py
+++ b/sfa/client/candidates.py
@@ -13,3 +13,31 @@ class Candidates:
         if len(matches)==1: return matches[0]
         else: return None
 
+#################### minimal test
+candidates_specs=[
+('create delete reset resources slices start status stop version', 
+  [ ('ver','version'),
+    ('r',None),
+    ('re',None),
+    ('res',None),
+    ('rese','reset'),
+    ('reset','reset'),
+    ('reso','resources'),
+    ('sli','slices'),
+    ('st',None),
+    ('sta',None),
+    ('stop','stop'),
+    ('a',None),
+])
+]
+
+def test_candidates ():
+    for (names, tuples) in candidates_specs:
+        names=names.split()
+        for (input,expected) in tuples:
+            got=Candidates(names).only_match(input)
+            if got==expected: print '.',
+            else: print 'X FAIL','names[',names,'] input',input,'expected',expected,'got',got
+
+if __name__ == '__main__':
+    test_candidates()
diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py
index d676de64..c95f550a 100755
--- a/sfa/client/sfaadmin.py
+++ b/sfa/client/sfaadmin.py
@@ -449,30 +449,3 @@ class SfaAdmin:
             print "Command failed, please check log for more info"
             raise
 
-candidates_specs=[
-('create delete reset resources slices start status stop version', 
-  [ ('ver','version'),
-    ('r',None),
-    ('re',None),
-    ('res',None),
-    ('rese','reset'),
-    ('reset','reset'),
-    ('reso','resources'),
-    ('sli','slices'),
-    ('st',None),
-    ('sta',None),
-    ('stop','stop'),
-    ('a',None),
-])
-]
-
-def test_candidates ():
-    for (names, tuples) in candidates_specs:
-        names=names.split()
-        for (input,expected) in tuples:
-            got=Candidates(names).only_match(input)
-            if got==expected: print '.',
-            else: print 'X FAIL','names[',names,'] input',input,'expected',expected,'got',got
-
-if __name__ == '__main__':
-    test_candidates()
-- 
2.47.0