mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-07 00:47:39 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
db23aff2ea commit 4ec8638c268ecdb710d97176a55cc5b818aa1a18
|
|
https://github.com/Lawouach/WebSocket-for-Python/issues/72
|
|
diff -ur ws4py-0.2.4.orig/test/test_cherrypy.py ws4py-0.2.4/test/test_cherrypy.py
|
|
--- test/test_cherrypy.py 2012-12-14 03:35:48.000000000 +0800
|
|
+++ test/test_cherrypy.py 2013-01-11 16:56:37.555534011 +0800
|
|
@@ -4,6 +4,7 @@
|
|
import cherrypy
|
|
from ws4py.server.cherrypyserver import WebSocketPlugin, WebSocketTool
|
|
from ws4py.websocket import EchoWebSocket
|
|
+from ws4py.compat import py3k
|
|
|
|
class FakeSocket(object):
|
|
def settimeout(self, timeout):
|
|
@@ -65,7 +66,10 @@
|
|
h = EchoWebSocket(s, [], [])
|
|
cherrypy.engine.publish('handle-websocket', h, ('127.0.0.1', 0))
|
|
self.assertEquals(len(cherrypy.engine.websocket.pool), 1)
|
|
- k = cherrypy.engine.websocket.pool.keys()[0]
|
|
+ if py3k:
|
|
+ k = list(cherrypy.engine.websocket.pool.keys())[0]
|
|
+ else:
|
|
+ k = cherrypy.engine.websocket.pool.keys()[0]
|
|
self.assertTrue(k is h)
|
|
self.assertEquals(cherrypy.engine.websocket.pool[k][1], ('127.0.0.1', 0))
|