[Android] Get package_info by using apk_under_test package.

[Android] Get package_info by using apk_under_test package.

Currently, the package_info used by the test apk is looked up by
by looking at the test_apk package in the list of package_infos.
Instead, we can just look at the package entries in the list
of package_infos and compare it to the package of the apk_under_test.

This makes things much nicer, when for instance you have multiple
test apks targeting the same package.

BUG=

Committed: https://crrev.com/f6c372aea4a4c79598b9414a9049b7ac5f659f2e
Cr-Commit-Position: refs/heads/master@{#387943}

[mikecase (-- gone --), 2016-04-15 20:26:24]

mikecase@chromium.org changed reviewers:
+ agrieve@chromium.org, rnephew@chromium.org

[mikecase (-- gone --), 2016-04-15 20:26:24]

My CL description is a little confusing, but basically the issue is that there
are two test apks (the downstream instrumentation test apk, and a uiautomator
apk) that both target the 'chrome' package.

Making the testrunner look up the 'package_info' to use by using the package
from the apk_under_test instead using the package from the test_apk.

[rnephew (Reviews Here), 2016-04-15 20:35:36]

https://codereview.chromium.org/1893693002/diff/1/build/android/pylib/instrum...
File build/android/pylib/instrumentation/instrumentation_test_instance.py
(right):

https://codereview.chromium.org/1893693002/diff/1/build/android/pylib/instrum...
build/android/pylib/instrumentation/instrumentation_test_instance.py:281: if
package_under_test == package_info.package:
In this context:
  package_under_test  ==  chrome
  self._test_package == chome_test_whatever_apk
correct?
If so, does switching this from the test apk to the chrome apk make sense?

[mikecase (-- gone --), 2016-04-15 20:55:37]

https://codereview.chromium.org/1893693002/diff/1/build/android/pylib/instrum...
File build/android/pylib/instrumentation/instrumentation_test_instance.py
(right):

https://codereview.chromium.org/1893693002/diff/1/build/android/pylib/instrum...
build/android/pylib/instrumentation/instrumentation_test_instance.py:281: if
package_under_test == package_info.package:
On 2016/04/15 at 20:35:36, rnephew1 wrote:
> In this context:
>   package_under_test  ==  chrome
>   self._test_package == chome_test_whatever_apk
> correct?
> If so, does switching this from the test apk to the chrome apk make sense?

Yeah, so for example. In the case of like ChromeTest apk.
package_info.package is the Chrome package
package_info.test_package is the ChromeTest package

Currently, we are determining which package_info to use by keying on the
"package_info.test_package" entry. I have no idea why we are currently doing it
this way. But I am removing the "package_info.test_package" entry all-together
and just keying on the "package_info.package" entry instead.

This makes is far more convenient when multiple test_apks have the same
apk_under_test.

[rnephew (Reviews Here), 2016-04-15 21:19:57]

On 2016/04/15 20:55:37, mikecase wrote:
>
https://codereview.chromium.org/1893693002/diff/1/build/android/pylib/instrum...
> File build/android/pylib/instrumentation/instrumentation_test_instance.py
> (right):
> 
>
https://codereview.chromium.org/1893693002/diff/1/build/android/pylib/instrum...
> build/android/pylib/instrumentation/instrumentation_test_instance.py:281: if
> package_under_test == package_info.package:
> On 2016/04/15 at 20:35:36, rnephew1 wrote:
> > In this context:
> >   package_under_test  ==  chrome
> >   self._test_package == chome_test_whatever_apk
> > correct?
> > If so, does switching this from the test apk to the chrome apk make sense?
> 
> Yeah, so for example. In the case of like ChromeTest apk.
> package_info.package is the Chrome package
> package_info.test_package is the ChromeTest package
> 
> Currently, we are determining which package_info to use by keying on the
> "package_info.test_package" entry. I have no idea why we are currently doing
it
> this way. But I am removing the "package_info.test_package" entry all-together
> and just keying on the "package_info.package" entry instead.
> 
> This makes is far more convenient when multiple test_apks have the same
> apk_under_test.

I find it a bit confusing that for 'ChromeTest.apk' package_info.package isn't
ChromeTest.

but, other than that, lgtm.

[mikecase (-- gone --), 2016-04-15 21:56:01]

The CQ bit was checked by mikecase@chromium.org

[commit-bot: I haz the power, 2016-04-15 21:56:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1893693002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1893693002/1

[commit-bot: I haz the power, 2016-04-15 22:21:57]

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

[commit-bot: I haz the power, 2016-04-15 22:21:58]

Try jobs failed on following builders:
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[agrieve, 2016-04-16 00:17:29]

Much nicer! lgtm

[mikecase (-- gone --), 2016-04-18 16:25:57]

The CQ bit was checked by mikecase@chromium.org

[commit-bot: I haz the power, 2016-04-18 16:26:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1893693002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1893693002/1

[commit-bot: I haz the power, 2016-04-18 17:32:48]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-04-18 17:34:19]

Description was changed from

==========
[Android] Get package_info by using apk_under_test package.

Currently, the package_info used by the test apk is looked up by
by looking at the test_apk package in the list of package_infos.
Instead, we can just look at the package entries in the list
of package_infos and compare it to the package of the apk_under_test.

This makes things much nicer, when for instance you have multiple
test apks targeting the same package.

BUG=
==========

to

==========
[Android] Get package_info by using apk_under_test package.

Currently, the package_info used by the test apk is looked up by
by looking at the test_apk package in the list of package_infos.
Instead, we can just look at the package entries in the list
of package_infos and compare it to the package of the apk_under_test.

This makes things much nicer, when for instance you have multiple
test apks targeting the same package.

BUG=

Committed: https://crrev.com/f6c372aea4a4c79598b9414a9049b7ac5f659f2e
Cr-Commit-Position: refs/heads/master@{#387943}
==========

[commit-bot: I haz the power, 2016-04-18 17:34:20]

Patchset 1 (id:??) landed as
https://crrev.com/f6c372aea4a4c79598b9414a9049b7ac5f659f2e
Cr-Commit-Position: refs/heads/master@{#387943}

[mikecase (-- gone --), 2016-04-18 20:10:58]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1900873002/ by mikecase@chromium.org.

The reason for reverting is: Breaks the MogoTests due to this error.

AttributeError: 'NoneType' object has no attribute 'GetPackageName'.