← Back to branch summary

~mc-return/compiz/compiz0.9.9.merge-plugin-startup

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp

Merged latest lp:compiz

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp
101
101
    TmpEnv env ("XORG_GTEST_CHILD_STDOUT", "1");
102
102
    ProcessPtr compiz (boost::make_shared <ct::CompizProcess> (Display (),
103
103
                                                               ct::CompizProcess::WaitForStartupMessage,
104
 
                                                               3000));
 
104
                                                               ct::CompizProcess::PluginList ()));
105
105
 
106
106
    pid_t firstProcessPid = compiz->Pid ();
107
107
 
130
130
    TmpEnv env ("XORG_GTEST_CHILD_STDOUT", "1");
131
131
    ProcessPtr firstCompiz (boost::make_shared <ct::CompizProcess> (Display (),
132
132
                                                                    ct::CompizProcess::WaitForStartupMessage,
133
 
                                                                    3000));
 
133
                                                                    ct::CompizProcess::PluginList ()));
134
134
 
135
135
    /* Expect it to exit */
136
136
    WaitForSuccessDeathTask::GetProcessState procState (boost::bind (&ct::CompizProcess::State,
142
142
                                                                     static_cast <ct::CompizProcess::StartupFlags> (
143
143
                                                                        ct::CompizProcess::WaitForStartupMessage |
144
144
                                                                        ct::CompizProcess::ReplaceCurrentWM),
 
145
                                                                     ct::CompizProcess::PluginList (),
145
146
                                                                     maximumWaitTime));
146
147
 
147
148
    if (!task->ReadMsgFromTask (PROCESS_EXITED_MSG, maximumWaitTime))
223
224
    TmpEnv env ("XORG_GTEST_CHILD_STDOUT", "1");
224
225
    ProcessPtr firstCompiz (boost::make_shared <ct::CompizProcess> (dpy,
225
226
                                                                    ct::CompizProcess::WaitForStartupMessage,
 
227
                                                                    ct::CompizProcess::PluginList (),
226
228
                                                                    3000));
227
229
 
228
230
    SlowDownTask::GetProcessState procState (boost::bind (&ct::CompizProcess::State,
244
246
                                                                     static_cast <ct::CompizProcess::StartupFlags> (
245
247
                                                                        ct::CompizProcess::ReplaceCurrentWM |
246
248
                                                                        ct::CompizProcess::WaitForStartupMessage),
 
249
                                                                     ct::CompizProcess::PluginList (),
247
250
                                                                     maximumWaitTime));
248
251
 
249
252
    /* Wait until the first one goes away */