summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--For Weekly Test/07-07-2011/Controller-SecondType.py (renamed from For Weekly Test/07-08-2011/Controller-SecondType.py)0
-rw-r--r--For Weekly Test/07-07-2011/Controller-SecondType_withDB.py (renamed from For Weekly Test/07-08-2011/Controller-SecondType_withDB.py)0
-rw-r--r--For Weekly Test/07-07-2011/ca_stMa.py (renamed from For Weekly Test/07-08-2011/ca_stMa.py)0
-rw-r--r--For Weekly Test/07-07-2011/classClient.py (renamed from For Weekly Test/07-08-2011/classClient.py)0
-rw-r--r--For Weekly Test/07-07-2011/classClient.pyc (renamed from For Weekly Test/07-08-2011/classClient.pyc)bin2759 -> 2759 bytes
-rw-r--r--For Weekly Test/07-07-2011/classDb.py (renamed from For Weekly Test/07-08-2011/classDb.py)0
-rw-r--r--For Weekly Test/07-07-2011/classDb.pyc (renamed from For Weekly Test/07-08-2011/classDb.pyc)bin5926 -> 5926 bytes
-rw-r--r--For Weekly Test/07-07-2011/classPing.py (renamed from For Weekly Test/07-08-2011/classPing.py)0
-rw-r--r--For Weekly Test/07-07-2011/classServer.py (renamed from For Weekly Test/07-08-2011/classServer.py)0
-rw-r--r--For Weekly Test/07-07-2011/classServer.pyc (renamed from For Weekly Test/07-08-2011/classServer.pyc)bin3365 -> 3365 bytes
-rw-r--r--For Weekly Test/07-07-2011/gsmcall2_.py (renamed from For Weekly Test/07-08-2011/gsmcall2_.py)0
-rw-r--r--For Weekly Test/07-07-2011/gsmcall_.py (renamed from For Weekly Test/07-08-2011/gsmcall_.py)0
-rw-r--r--For Weekly Test/07-07-2011/gsmincom_.py (renamed from For Weekly Test/07-08-2011/gsmincom_.py)0
-rw-r--r--For Weekly Test/07-07-2011/sipCall.py (renamed from For Weekly Test/07-08-2011/sipCall.py)0
-rw-r--r--For Weekly Test/07-07-2011/sipReceiver.py (renamed from For Weekly Test/07-08-2011/sipReceiver.py)0
-rw-r--r--For Weekly Test/19-08-2011/TrueTable2.py10
16 files changed, 10 insertions, 0 deletions
diff --git a/For Weekly Test/07-08-2011/Controller-SecondType.py b/For Weekly Test/07-07-2011/Controller-SecondType.py
index 31df36c..31df36c 100644
--- a/For Weekly Test/07-08-2011/Controller-SecondType.py
+++ b/For Weekly Test/07-07-2011/Controller-SecondType.py
diff --git a/For Weekly Test/07-08-2011/Controller-SecondType_withDB.py b/For Weekly Test/07-07-2011/Controller-SecondType_withDB.py
index a45fd05..a45fd05 100644
--- a/For Weekly Test/07-08-2011/Controller-SecondType_withDB.py
+++ b/For Weekly Test/07-07-2011/Controller-SecondType_withDB.py
diff --git a/For Weekly Test/07-08-2011/ca_stMa.py b/For Weekly Test/07-07-2011/ca_stMa.py
index 5df33c8..5df33c8 100644
--- a/For Weekly Test/07-08-2011/ca_stMa.py
+++ b/For Weekly Test/07-07-2011/ca_stMa.py
diff --git a/For Weekly Test/07-08-2011/classClient.py b/For Weekly Test/07-07-2011/classClient.py
index ce02d19..ce02d19 100644
--- a/For Weekly Test/07-08-2011/classClient.py
+++ b/For Weekly Test/07-07-2011/classClient.py
diff --git a/For Weekly Test/07-08-2011/classClient.pyc b/For Weekly Test/07-07-2011/classClient.pyc
index b93c110..b93c110 100644
--- a/For Weekly Test/07-08-2011/classClient.pyc
+++ b/For Weekly Test/07-07-2011/classClient.pyc
Binary files differ
diff --git a/For Weekly Test/07-08-2011/classDb.py b/For Weekly Test/07-07-2011/classDb.py
index 615b868..615b868 100644
--- a/For Weekly Test/07-08-2011/classDb.py
+++ b/For Weekly Test/07-07-2011/classDb.py
diff --git a/For Weekly Test/07-08-2011/classDb.pyc b/For Weekly Test/07-07-2011/classDb.pyc
index 92d31c6..92d31c6 100644
--- a/For Weekly Test/07-08-2011/classDb.pyc
+++ b/For Weekly Test/07-07-2011/classDb.pyc
Binary files differ
diff --git a/For Weekly Test/07-08-2011/classPing.py b/For Weekly Test/07-07-2011/classPing.py
index e13b32b..e13b32b 100644
--- a/For Weekly Test/07-08-2011/classPing.py
+++ b/For Weekly Test/07-07-2011/classPing.py
diff --git a/For Weekly Test/07-08-2011/classServer.py b/For Weekly Test/07-07-2011/classServer.py
index 97a398d..97a398d 100644
--- a/For Weekly Test/07-08-2011/classServer.py
+++ b/For Weekly Test/07-07-2011/classServer.py
diff --git a/For Weekly Test/07-08-2011/classServer.pyc b/For Weekly Test/07-07-2011/classServer.pyc
index 52f5085..52f5085 100644
--- a/For Weekly Test/07-08-2011/classServer.pyc
+++ b/For Weekly Test/07-07-2011/classServer.pyc
Binary files differ
diff --git a/For Weekly Test/07-08-2011/gsmcall2_.py b/For Weekly Test/07-07-2011/gsmcall2_.py
index bf8e662..bf8e662 100644
--- a/For Weekly Test/07-08-2011/gsmcall2_.py
+++ b/For Weekly Test/07-07-2011/gsmcall2_.py
diff --git a/For Weekly Test/07-08-2011/gsmcall_.py b/For Weekly Test/07-07-2011/gsmcall_.py
index 039622c..039622c 100644
--- a/For Weekly Test/07-08-2011/gsmcall_.py
+++ b/For Weekly Test/07-07-2011/gsmcall_.py
diff --git a/For Weekly Test/07-08-2011/gsmincom_.py b/For Weekly Test/07-07-2011/gsmincom_.py
index a49c24c..a49c24c 100644
--- a/For Weekly Test/07-08-2011/gsmincom_.py
+++ b/For Weekly Test/07-07-2011/gsmincom_.py
diff --git a/For Weekly Test/07-08-2011/sipCall.py b/For Weekly Test/07-07-2011/sipCall.py
index eb44b4a..eb44b4a 100644
--- a/For Weekly Test/07-08-2011/sipCall.py
+++ b/For Weekly Test/07-07-2011/sipCall.py
diff --git a/For Weekly Test/07-08-2011/sipReceiver.py b/For Weekly Test/07-07-2011/sipReceiver.py
index 6404f10..6404f10 100644
--- a/For Weekly Test/07-08-2011/sipReceiver.py
+++ b/For Weekly Test/07-07-2011/sipReceiver.py
diff --git a/For Weekly Test/19-08-2011/TrueTable2.py b/For Weekly Test/19-08-2011/TrueTable2.py
index 31652a8..c5edf3d 100644
--- a/For Weekly Test/19-08-2011/TrueTable2.py
+++ b/For Weekly Test/19-08-2011/TrueTable2.py
@@ -82,11 +82,15 @@ def smartTest():
print "BTS 2 Down"
elif result == '486':
print "BTS 2 and 3 indicate having problem"
+<<<<<<< HEAD
+
+=======
else:
print "have problem with handler"
else:
print "have problem with handler"
+>>>>>>> 24414ec73f840f3f9050b4724bdeae6fd9731870
elif result == '486':
print "make a call to GSMRZ2"
initTest('sip','GSMRZ2')
@@ -107,12 +111,18 @@ def smartTest():
print "BTS 1 & 2 indicate having problem"
else:
print "OpenBSc Down"
+<<<<<<< HEAD
+ else:
+ print "Handler having problem, STOP the test. Please wait 10 Second and call the test again"
+
+=======
else:
print "have problem with handler"
+>>>>>>> 24414ec73f840f3f9050b4724bdeae6fd9731870
elif destination == 'GSMExt':
print "make a call to O2"
initTest('sip','GSMExt.O2')