ObjFW  Diff

Differences From Artifact [8dbc611e84]:

• File tests/OFKernelEventObserverTests.m — part of check-in [220513a3f5] at 2015-05-09 18:13:19 on branch trunk — More OFKernelEventObserver refactoring

  This was necessary because select(), poll() and kevent() on FreeBSD and
  OS X would sometimes return 0 events, even if there are some, and
  sometimes return the correct number of events that were pending, meaning
  the number of events returned is unreliable. To make things worse,
  whether it returns 0 or the number of events that were pending is
  completely non-deterministic on both FreeBSD and OS X (running the same
  tests multiple times in a row would make it sometimes work and sometimes
  fail).

  In order to prevent code from depending on the return value of
  -[observeForTimeInterval:] (which would depend on select(), poll() and
  kevent() returning the correct number), OFKernelObserver no longer
  returns whether there were pending events. It is expected that
  -[observe] or -[observeForTimeInterval:] is just called in a loop as
  long as events should be handled.

  The tests have been changed as well to reflect this. What they do now is
  set a deadline and call -[observeForTimeInterval:] with a small timeout
  in a loop until the deadline is reached or all events have been handled.

  Note: DragonFlyBSD has not been tested, but will most likely behave like
  FreeBSD and OS X. (user: js, size: 5326) [annotate] [blame] [check-ins using]

To Artifact [70f76a2e2d]:

• File tests/OFKernelEventObserverTests.m — part of check-in [504643ffee] at 2015-05-10 00:42:01 on branch trunk — OFKernelEventObserverTests: Prevent line wrap (user: js, size: 5290) [annotate] [blame] [check-ins using]

143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172

			    outputFailure: @"-[observe] with listening socket"
				 inModule: module];

		_accepted = [[object accept] retain];
		[_observer addObjectForReading: _accepted];

		[_testsAppDelegate
		    outputTesting: @"-[observe] with data to read available"
			 inModule: module];

		break;
	case 1:
		if (object == _accepted &&
		    [object readIntoBuffer: &buf
				    length: 1] == 1 && buf == '0')
			[_testsAppDelegate
			    outputSuccess: @"-[observe] with data to read "
					   @"available"
				 inModule: module];
		else
			[_testsAppDelegate
			    outputFailure: @"-[observe] with data to read "
					   @"available"
				 inModule: module];

		[_client close];

		[_testsAppDelegate
		    outputTesting: @"-[observe] with closed connection"
			 inModule: module];

|








|
<



|
<

143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159

160
161
162
163

164
165
166
167
168
169
170

			    outputFailure: @"-[observe] with listening socket"
				 inModule: module];

		_accepted = [[object accept] retain];
		[_observer addObjectForReading: _accepted];

		[_testsAppDelegate
		    outputTesting: @"-[observe] with data ready to read"
			 inModule: module];

		break;
	case 1:
		if (object == _accepted &&
		    [object readIntoBuffer: &buf
				    length: 1] == 1 && buf == '0')
			[_testsAppDelegate
			    outputSuccess: @"-[observe] with data ready to read"

				 inModule: module];
		else
			[_testsAppDelegate
			    outputFailure: @"-[observe] with data ready to read"

				 inModule: module];

		[_client close];

		[_testsAppDelegate
		    outputTesting: @"-[observe] with closed connection"
			 inModule: module];