[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/Views/Browser/tests - testServerControlView.py:1.1.2.4

[Christian Theune]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/Views/Browser/tests
In directory cvs.zope.org:/tmp/cvs-serv26313/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/Views/Browser/tests

Modified Files:
      Tag: Zope-3x-branch
	testServerControlView.py 
Log Message:
Merged the ctheune-services_move-branch to Zope-3x-branch

- Moved Zope.App.OFS.ServiceManager into the Zope.App.OFS.Services package
- Moved Zope.App.OFS.RoleService into the Zope.App.OFS.Services package



=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/Views/Browser/tests/testServerControlView.py 1.1.2.3 => 1.1.2.4 ===
   ServerControl
 from Zope.ComponentArchitecture import getService
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup\
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup\
            import PlacefulSetup
 
 class Test(PlacefulSetup, TestCase):