Minor tweaks.

Author: Tom Barnes

src/integration-tests/introspector/checkBeans.input

@@ -1,5 +1,6 @@
 /Servers/admin-server,ListenAddress,,domain1-admin-server
-/Servers/admin-server,ListenAddress,foob,domain1-admin-server
+#/Servers/admin-server,ListenAddress,foob,domain1-admin-server
 #/Servers/admin-server,ListenAddress,,foob
 #/Servers/admin-server,ListenAddress,,
+#,
 

src/integration-tests/introspector/checkBeans.py

@@ -15,6 +15,10 @@
 #   For example:
 #      /Servers/admin-server,ListenAddress,,domain1-admin-server
 #
+#
+#   Then run this program:
+#      wlst.sh checkBeans admin_name admin_pass url input_file_name
+#
 #   The program will check that the original-val matches the value
 #   in the 'domainConfig' mbean tree and that the overridden-val
 #   matches the value in the 'serverConfig' mbean tree.
@@ -26,13 +30,10 @@
 
 admin_username = sys.argv[1]
 admin_password = sys.argv[2]
-input_file = sys.argv[3]
-
-admin_port=os.getenv('LOCAL_SERVER_DEFAULT_PORT')
+url = sys.argv[3]
+input_file = sys.argv[4]
 
-service_name=os.getenv('SERVICE_NAME')
-
-connect(admin_username,admin_password,"t3://" + service_name + ":" + admin_port)
+connect(admin_username,admin_password,url)
 
 errors=[]
 def addError(err):
@@ -48,8 +49,9 @@ def addError(err):
   if len(line)>0 and line[0]=='#':
     continue
   words=line.split(',')
-  if (len(words) == 1 and line != '') or len(words) != 4:
-    addError("Error in line syntax line#=" + str(line_no) + " line='"+line+"'")
+  if len(words) != 4:
+    if line != '':
+      addError("Error in line syntax line#=" + str(line_no) + " line='"+line+"'")
     continue
   bean_path=words[0]
   attr=words[1]
@@ -95,3 +97,5 @@ def addError(err):
   for err in errors:
     print " --> " + err
   exit(exitcode=1)
+
+print "Test Passed!"

src/integration-tests/introspector/introspectTest.sh

@@ -581,8 +581,17 @@ deploySinglePodService ${MANAGED_SERVER_NAME_BASE?}1 ${MANAGED_SERVER_PORT?} 308
 # TBD 1 weblogic/welcome1 should be deduced via a base64 of the admin secret
 # TBD 2 generate checkBeans.input instead of using a hard coded file, add more beans to check, and check mgd servers too
 
-kubectl cp checkBeans.input domain1-admin-server:/shared/checkBeans.input
-kubectl cp checkBeans.py domain1-admin-server:/shared/checkBeans.py
-kubectl exec -it domain1-admin-server wlst.sh /shared/checkBeans.py weblogic welcome1 /shared/checkBeans.input
+trace "Info: Checking beans to see if sit-cfg took effect.  Input file 'checkBeans.input', output file '$test_home/checkBeans.out'."
+kubectl cp checkBeans.input domain1-admin-server:/shared/checkBeans.input || exit 1
+kubectl cp checkBeans.py domain1-admin-server:/shared/checkBeans.py || exit 1
+kubectl exec -it domain1-admin-server \
+  wlst.sh /shared/checkBeans.py \
+    weblogic welcome1 t3://domain1-admin-server:7001 \
+    /shared/checkBeans.input \
+    > $test_home/checkBeans.out 2>&1
+if [ $? -ne 0 ]; then
+  trace "Error:  checkBeans failed, see '$test_home/checkBeans.out'."
+  exit 1
+fi
 
 trace "Info: success!"