1
=== modified file 'tests/unit/CMakeLists.txt'
2
--- tests/unit/CMakeLists.txt	2015-12-21 21:02:33 +0000
3
+++ tests/unit/CMakeLists.txt	2016-06-27 16:42:21 +0000
4
@@ -44,10 +44,14 @@
5
44
                     ENVIRONMENT
44
                     ENVIRONMENT
6
45
                     "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
45
                     "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
7
46
46
15
47
add_test(test_libertine_launch
47
set(DISABLED 1)
16
48
  "/usr/bin/python3" "-m" "testtools.run" "libertine_launch_tests"
48
17
49
)
49
if (NOT DISABLED)
18
50
set_tests_properties(test_libertine_launch
50
    add_test(test_libertine_launch
19
51
                     PROPERTIES
51
      "/usr/bin/python3" "-m" "testtools.run" "libertine_launch_tests"
20
52
                     ENVIRONMENT
52
    )
21
53
                     "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
53
    set_tests_properties(test_libertine_launch
22
54
                         PROPERTIES
23
55
                         ENVIRONMENT
24
56
                         "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
25
57
endif()
26
54
58
27
=== modified file 'tools/libertine-session-bridge'
28
--- tools/libertine-session-bridge	2016-05-19 20:00:22 +0000
29
+++ tools/libertine-session-bridge	2016-06-27 16:42:21 +0000
30
@@ -170,6 +170,7 @@
31
170
        except:
170
        except:
32
171
            container_session_sock.close()
171
            container_session_sock.close()
33
172
            container_session_sock = None
172
            container_session_sock = None
34
173
            os.remove(session_socket_path)
35
173
            raise
174
            raise
36
174
        else:
175
        else:
37
175
            host_session_socket_path_map.update({container_session_sock:host_session_path})
176
            host_session_socket_path_map.update({container_session_sock:host_session_path})
Status:	Merged
Approved by:	Christopher Townsend on 2016-06-27
Approved revision:	256
Merged at revision:	256
Proposed branch:	lp:~brandontschaefer/libertine/remove-failing-socket-path
Merge into:	lp:libertine
Diff against target:	37 lines (+12/-7) 2 files modified tests/unit/CMakeLists.txt (+11/-7) tools/libertine-session-bridge (+1/-0)
To merge this branch:	bzr merge lp:~brandontschaefer/libertine/remove-failing-socket-path
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2016-06-27	Approve on 2016-06-27
Libertine CI Bot	continuous-integration		Approve on 2016-06-27
Review via email: mp+298441@code.launchpad.net
1	=== modified file 'tests/unit/CMakeLists.txt'
2	--- tests/unit/CMakeLists.txt 2015-12-21 21:02:33 +0000
3	+++ tests/unit/CMakeLists.txt 2016-06-27 16:42:21 +0000
4	@@ -44,10 +44,14 @@
5	44	ENVIRONMENT	44	ENVIRONMENT
6	45	"GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")	45	"GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
7	46		46
15	47	add_test(test_libertine_launch	47	set(DISABLED 1)
16	48	"/usr/bin/python3" "-m" "testtools.run" "libertine_launch_tests"	48
17	49	)	49	if (NOT DISABLED)
18	50	set_tests_properties(test_libertine_launch	50	add_test(test_libertine_launch
19	51	PROPERTIES	51	"/usr/bin/python3" "-m" "testtools.run" "libertine_launch_tests"
20	52	ENVIRONMENT	52	)
21	53	"GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")	53	set_tests_properties(test_libertine_launch
22			54	PROPERTIES
23			55	ENVIRONMENT
24			56	"GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
25			57	endif()
26	54		58
27	=== modified file 'tools/libertine-session-bridge'
28	--- tools/libertine-session-bridge 2016-05-19 20:00:22 +0000
29	+++ tools/libertine-session-bridge 2016-06-27 16:42:21 +0000
30	@@ -170,6 +170,7 @@
31	170	except:	170	except:
32	171	container_session_sock.close()	171	container_session_sock.close()
33	172	container_session_sock = None	172	container_session_sock = None
34			173	os.remove(session_socket_path)
35	173	raise	174	raise
36	174	else:	175	else:
37	175	host_session_socket_path_map.update({container_session_sock:host_session_path})	176	host_session_socket_path_map.update({container_session_sock:host_session_path})