Merge lp:~zhangew401/yelp-scope/bug-fixes into lp:yelp-scope

[Zhang Enwei]

Fix lp:1626381.
My first thought is to catch the panic, but I found it is throw by runtime.throw, not by runtime.panic. Therefore I cannot catch it by recover().
The "freelist empty" error generally means that the garbage collector has
collected a pointer that is still live. The GC put the memory on the
freelist, but then the memory was changed by the program, breaking the
freelist.

[Zhang Enwei (zhangew401)]

I reproduced it. Checking.

[lp:~zhangew401/yelp-scope/bug-fixes]

74. By Zhang Enwei on 2016-10-11

add some error checking

Unmerged revisions

74. By Zhang Enwei on 2016-10-11

add some error checking

73. By Zhang Enwei on 2016-10-09

Remove useless code

72. By Zhang Enwei on 2016-10-09

Format the code

71. By Zhang Enwei on 2016-10-09

Fix null pointer panic

70. By Zhang Enwei on 2016-09-27

fix lp:1626381 and lp:1609282

=== modified file '.bzrignore'
--- .bzrignore	2016-03-29 15:19:44 +0000
+++ .bzrignore	2016-10-11 12:25:38 +0000
@@ -29,3 +29,11 @@
 src/com.canonical.scopes.yelp_yelp
 src/com.canonical.scopes.yelp_yelp.ini
 src/com.canonical.scopes.yelp_yelp.ini.needtranslate
+temp.json
+test.sh
+data/content.json
+src/yelp1.go
+src/yelp2.go
+src/yelp_dep.go
+src/CMakeLists_.txt
+scope-registry.log

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-11 02:26:09 +0000
+++ CMakeLists.txt	2016-10-11 12:25:38 +0000
@@ -20,7 +20,7 @@
 set(IS_GO_SCOPE True)
 set(USES_DEPARTMENTS True)
 set(SEARCH_TEST_TERM test)
-set(VERSION 1.6)
+set(VERSION 1.7)
 set(PACKAGE_NAME com.canonical.scopes.yelp)
 
 set(PKG_PREFIX "com.canonical.scopes")
@@ -36,13 +36,27 @@
 add_Subdirectory(po)
 add_subdirectory(tests)
 
-configure_file (
-    "manifest.json.in"
-    "manifest.json"
+#This command figures out the target architecture and puts it into the manifest file
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_ARCH
+  OUTPUT_VARIABLE CLICK_ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-install(FILES manifest.json DESTINATION "/")
-install(FILES "scope-security.json" DESTINATION "/")
-
-
-install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/${SCOPE_CONFINED_NAME}  DESTINATION ${SCOPE_INSTALLDIR})
+if (${CLICK_ARCH} STREQUAL "arm64")
+    set(TOOLCHAIN_PREFIX aarch64-linux-gnu)
+elseif (${CLICK_ARCH} STREQUAL "armhf")
+    set(TOOLCHAIN_PREFIX arm-linux-gnueabihf)
+elseif (${CLICK_ARCH} STREQUAL "i386")
+    set(TOOLCHAIN_PREFIX i386-linux-gnu)
+elseif (${CLICK_ARCH} STREQUAL "amd64")
+    set(TOOLCHAIN_PREFIX x86_64-linux-gnu)
+endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scope-security.json ${CMAKE_CURRENT_BINARY_DIR}/scope-security.json)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION "/")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/scope-security.json DESTINATION "/")
+
+install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/${SCOPE_CONFINED_NAME}  DESTINATION ${SCOPE_INSTALLDIR}/${TOOLCHAIN_PREFIX})

=== removed file 'manifest.json'
--- manifest.json	2016-07-11 02:26:09 +0000
+++ manifest.json	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-{
-    "description": "Yelp scope",
-    "framework": "ubuntu-sdk-15.04.4",
-    "architecture": "armhf",
-    "hooks": {
-        "yelp": {
-            "scope": "yelp",
-            "apparmor": "scope-security.json"
-        }
-    },
-    "icon": "icon",
-    "maintainer": "Canonical Content Partners <[e-mail]>",
-    "name": "com.canonical.scopes.yelp",
-    "title": "Yelp scope",
-    "version": "1.6"
-}

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-04-28 07:37:52 +0000
+++ manifest.json.in	2016-10-11 12:25:38 +0000
@@ -1,7 +1,7 @@
 {
     "description": "Yelp scope",
     "framework": "ubuntu-sdk-15.04.4",
-    "architecture": "armhf",
+    "architecture": "@CLICK_ARCH@",
     "hooks": {
         "yelp": {
             "scope": "yelp",

=== modified file 'src/yelp.go'
--- src/yelp.go	2016-04-14 15:41:23 +0000
+++ src/yelp.go	2016-10-11 12:25:38 +0000
@@ -184,19 +184,25 @@
 	var client http.Client
 	var method string = "GET"
 	var url string = yl.buildUrl(params)
-	req, _ := oauth.NewRequest(method, url, params, credentials)
-
-	resp, _ := client.Do(req.HttpRequest())
-	defer resp.Body.Close()
-	decoder := json.NewDecoder(resp.Body)
-	return decoder.Decode(result)
-
+        req, reqerr := oauth.NewRequest(method, url, params, credentials)
+        if reqerr != nil {
+                log.Println("=== YELP. NewRequest error:", reqerr.Error())
+                return reqerr
+        }
+
+	resp, err := client.Do(req.HttpRequest())
+        if resp != nil {
+                defer resp.Body.Close()
+        }
+	if err != nil {
+		return err
+	}
+        return json.NewDecoder(resp.Body).Decode(result)
 }
 
 func (yl *YelpScope) getDepts(result interface{}) error {
 	deptfile, _ := os.Open(yl.Dir + "/depts.json")
-	decoder := json.NewDecoder(deptfile)
-	return decoder.Decode(result)
+	return json.NewDecoder(deptfile).Decode(result)
 }
 
 func (yl *YelpScope) getLayout() string {
@@ -366,7 +372,10 @@
 	var deptlist1 deptlist
 	err = yl.getDepts(&deptlist1)
 	for _, v := range deptlist1.Depts {
-		newdept, _ := scopes.NewDepartment(v.Label, q, gettext.Gettext(v.Name))
+		newdept, err := scopes.NewDepartment(v.Label, q, gettext.Gettext(v.Name))
+		if err != nil {
+			continue
+		}
 		rootDept.AddSubdepartment(newdept)
 		if len(v.Subs) != 0 {
 			for _, s := range v.Subs {
@@ -419,6 +428,7 @@
 			}
 			// call to the web api
 			if err := yl.get(queryParams, &response); err != nil {
+				log.Printf("=== YELP. get method return error:%q\n", err.Error())
 				return err
 			}
 			if response.Error.Text != "" {

=== modified file 'tests/autopilot/yelp/test_generic.py.in'
--- tests/autopilot/yelp/test_generic.py.in	2016-07-11 02:26:09 +0000
+++ tests/autopilot/yelp/test_generic.py.in	2016-10-11 12:25:38 +0000
@@ -94,15 +94,32 @@
 
     def test_executable_exists(self):
         """Verify the go executable or .so exists"""
-
+        cmd = ["dpkg", "--print-architecture"]
+        outp = subprocess.check_output(cmd)
+        outstring = outp.decode(encoding).strip()
+        if outstring == "armhf":
+            libpath = "arm-linux-gnueabihf"
+        elif outstring == "arm64":
+            libpath = "aarch64-linux-gnu"
+        elif outstring == "i386":
+            libpath = "i386-linux-gnu"
+        elif outstring == "amd64":
+            libpath = "x86_64-linux-gnu"
+        else:
+            libpath = ""
         if @IS_GO_SCOPE@:
             exec_path = os.path.join(scope_path, scope_id)
-            self.assertTrue(os.path.isfile(exec_path), exec_path + ' does not exist')
-            self.assertTrue(os.access(exec_path, os.X_OK), 'access error on ' + exec_path)
+            exec_path_platform = os.path.join(scope_path, libpath, scope_id)
+            exec_exist = os.path.isfile(exec_path) or os.path.isfile(exec_path_platform)
+            self.assertTrue(exec_exist, exec_path + ' or ' + exec_path_platform + ' does not exist')
+            exec_access = os.access(exec_path, os.X_OK) or os.access(exec_path_platform, os.X_OK)
+            self.assertTrue(exec_access, 'access error on ' + exec_path + ' or ' + exec_path_platform)
         else:
             lib = "lib" + scope_id + ".so"
             so_path = os.path.join(scope_path, lib)
-            self.assertTrue(os.path.isfile(so_path), so_path + ' does not exist')
+            so_path_platform = os.path.join(scope_path, libpath, lib)
+            so_file_exist = os.path.isfile(so_path) or os.path.isfile(so_path_platform)
+            self.assertTrue(so_file_exist, so_path + ' or ' + so_path_platform + ' does not exist')
 
     def test_ini_scopeconfig_fields_untranslated(self):
         """Verify the ini file has some REQUIRED key/value pairs"""