Update OCMock to 3.1.5

Update OCMock to 3.1.5

This CL updates OCMock to 3.1.5.
This update is possible as the iOS code is now open source and the OSX uses the
10.10 SDK.

BUG=622753
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2624143003
Cr-Commit-Position: refs/heads/master@{#449299}
Committed: https://chromium.googlesource.com/chromium/src/+/d8d4403f85a825365647cd629289c210afc0da49

[gambard, 2017-01-11 12:05:16]

The CQ bit was checked by gambard@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-11 12:05:23]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-11 12:12:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-11 12:12:24]

Dry run: Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[gambard, 2017-01-11 15:18:45]

The CQ bit was checked by gambard@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-11 15:19:07]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-11 15:26:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-11 15:26:42]

Dry run: Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[gambard, 2017-01-11 16:08:55]

gambard@chromium.org changed reviewers:
+ rsesek@chromium.org

[gambard, 2017-01-11 16:08:56]

I want to update OCMock to a newer version, but I am hitting a presubmit error
(the code is using UTF8String which is banned).
I cannot use DEPS dependency as I need to patch in
3e193f3c2d4ea4ada63df54c8ce98e7ea4cf768f to have the same functionality as the
older version (http://crbug.com/533663). This version does not seem to build, as
ocmock.org states it needs OSX 10.11 SDK and my test
(https://codereview.chromium.org/2626723004/) does not compile.

So the options are:
- Land this patch using git cl land and ignore presubmit
- Fork ocmock on github, patch 3e193f3 in and add DEPS to the fork
- Remove the 3e193f3 patch as it passed the dry run without it.

WDYT?

[Robert Sesek, 2017-01-11 16:32:53]

LGTM. Please also ping the OSPO for the license change (per
https://chromium.googlesource.com/chromium/src.git/+/master/docs/adding_to_th...).

On 2017/01/11 16:08:56, gambard wrote:
> I want to update OCMock to a newer version, but I am hitting a presubmit error
> (the code is using UTF8String which is banned).
> I cannot use DEPS dependency as I need to patch in
> 3e193f3c2d4ea4ada63df54c8ce98e7ea4cf768f to have the same functionality as the
> older version (http://crbug.com/533663). This version does not seem to build,
as
> http://ocmock.org states it needs OSX 10.11 SDK and my test
> (https://codereview.chromium.org/2626723004/) does not compile.

Thanks for doing this! I think we should be moving towards the 10.11 SDK soonish
on Mac, but we're not there yet.

> So the options are:
> - Land this patch using git cl land and ignore presubmit
> - Fork ocmock on github, patch 3e193f3 in and add DEPS to the fork
> - Remove the 3e193f3 patch as it passed the dry run without it.
> 
> WDYT?

I'd just submit with NOPRESUBMIT=true.

[gambard, 2017-01-11 16:51:58]

On 2017/01/11 16:32:53, Robert Sesek wrote:
> LGTM. Please also ping the OSPO for the license change (per
>
https://chromium.googlesource.com/chromium/src.git/+/master/docs/adding_to_th...).
> 
> On 2017/01/11 16:08:56, gambard wrote:
> > I want to update OCMock to a newer version, but I am hitting a presubmit
error
> > (the code is using UTF8String which is banned).
> > I cannot use DEPS dependency as I need to patch in
> > 3e193f3c2d4ea4ada63df54c8ce98e7ea4cf768f to have the same functionality as
the
> > older version (http://crbug.com/533663). This version does not seem to
build,
> as
> > http://ocmock.org states it needs OSX 10.11 SDK and my test
> > (https://codereview.chromium.org/2626723004/) does not compile.
> 
> Thanks for doing this! I think we should be moving towards the 10.11 SDK
soonish
> on Mac, but we're not there yet.
> 
> > So the options are:
> > - Land this patch using git cl land and ignore presubmit
> > - Fork ocmock on github, patch 3e193f3 in and add DEPS to the fork
> > - Remove the 3e193f3 patch as it passed the dry run without it.
> > 
> > WDYT?
> 
> I'd just submit with NOPRESUBMIT=true.

Thanks! Yes I need to get approval before landing it.

[gambard, 2017-02-07 12:55:01]

The CQ bit was checked by gambard@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-07 12:55:10]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-07 13:03:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-07 13:03:13]

Dry run: Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[gambard, 2017-02-08 09:17:04]

In addition, I patched in c32abcaba428921d8ac12ac98b272ecf8241f9bb and
33aeea46b0912d9f57ff0ee2763f2667ac099acc to allow the use of .andReturn(...). I
also added 'extern "C"' in OCMFunctions.h to have linkage.

[Robert Sesek, 2017-02-08 19:49:31]

slgtm

[gambard, 2017-02-09 13:59:03]

Description was changed from

==========
Update OCMock to 3.1.5

This CL updates OCMock to 3.1.5.
This update is possible as the iOS code is now open source and the OSX uses the
10.10 SDK.

BUG=622753
==========

to

==========
Update OCMock to 3.1.5

This CL updates OCMock to 3.1.5.
This update is possible as the iOS code is now open source and the OSX uses the
10.10 SDK.

BUG=622753
NOPRESUBMIT=true
==========

[marq (ping after 24h), 2017-02-09 14:30:01]

marq@chromium.org changed reviewers:
+ marq@chromium.org

[marq (ping after 24h), 2017-02-09 14:30:02]

ios/ LGTM

[gambard, 2017-02-09 14:30:20]

The CQ bit was checked by gambard@chromium.org

[gambard, 2017-02-09 14:30:21]

The patchset sent to the CQ was uploaded after l-g-t-m from rsesek@chromium.org
Link to the patchset: https://codereview.chromium.org/2624143003/#ps40001
(title: "Patches in more commits")

[commit-bot: I haz the power, 2017-02-09 14:30:40]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-09 15:41:51]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1486650620822550,
"parent_rev": "0452a9d5c152a81bdbbc2ad5fa4bc7ac95094b3b", "commit_rev":
"d8d4403f85a825365647cd629289c210afc0da49"}

[commit-bot: I haz the power, 2017-02-09 15:42:26]

Description was changed from

==========
Update OCMock to 3.1.5

This CL updates OCMock to 3.1.5.
This update is possible as the iOS code is now open source and the OSX uses the
10.10 SDK.

BUG=622753
NOPRESUBMIT=true
==========

to

==========
Update OCMock to 3.1.5

This CL updates OCMock to 3.1.5.
This update is possible as the iOS code is now open source and the OSX uses the
10.10 SDK.

BUG=622753
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2624143003
Cr-Commit-Position: refs/heads/master@{#449299}
Committed:
https://chromium.googlesource.com/chromium/src/+/d8d4403f85a825365647cd629289...
==========

[commit-bot: I haz the power, 2017-02-09 15:42:27]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/d8d4403f85a825365647cd629289...